Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in / Register
M
monero-site
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 2
    • Issues 2
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 5
    • Merge Requests 5
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • monero-project
  • monero-site
  • Merge Requests
  • !997

Merged
Opened Feb 10, 2019 by erciccione@erciccioneReporter

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://repo.getmonero.org/erciccione/monero-site.git" "fix-pruning-post"
git checkout -b "erciccione/monero-site-fix-pruning-post" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "erciccione/monero-site-fix-pruning-post"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

remove link in blog post 'pruning' (fix jekyll error)

  • Overview 4
  • Commits 1
  • Changes 1

the 'author' field in !989 (merged) contains a link in markdown, which is not accepted by jekyll (in that header). Fixes the error Error: could not read file /var/www/getmonero.org/core/_posts/2019-02-01-pruning.md: (<unknown>): did not find expected key while parsing a block mapping at line 2 column 1

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: monero-project/monero-site!997
Source branch: fix-pruning-post

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.