diff options
author | Evan Read <eread@gitlab.com> | 2021-02-24 03:36:53 +0300 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2021-02-24 03:36:53 +0300 |
commit | e700be5f5b08aa371496df6aea85613385a3601b (patch) | |
tree | 67ce00fdc80923b45f8612e9760b66ade2c23f8a | |
parent | 621d44a22fb35f884eab6ff83f117caf699d9280 (diff) | |
parent | 4390ca50052e7a7f4cf27eb1cc58ec09c0449602 (diff) |
Merge branch 'sselhorn-master-patch-24297' into 'master'
Moved merge requests to top level
See merge request gitlab-org/gitlab-docs!1561
-rw-r--r-- | content/_data/default-nav.yaml | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/content/_data/default-nav.yaml b/content/_data/default-nav.yaml index c224b9f0..ed536ef3 100644 --- a/content/_data/default-nav.yaml +++ b/content/_data/default-nav.yaml @@ -564,39 +564,6 @@ sections: doc_url: 'user/project/pages/introduction.html' - category_title: Insights category_url: 'user/project/insights/' - - category_title: Merge Requests - category_url: 'user/project/merge_requests/' - docs: - - doc_title: Allow collaboration - doc_url: 'user/project/merge_requests/allow_collaboration.html' - - doc_title: Approvals - doc_url: 'user/project/merge_requests/merge_request_approvals.html' - - doc_title: Creating merge requests - doc_url: 'user/project/merge_requests/creating_merge_requests.html' - - doc_title: Cherry pick changes - doc_url: 'user/project/merge_requests/cherry_pick_changes.html' - - doc_title: Getting started - doc_url: 'user/project/merge_requests/getting_started.html' - - doc_title: Merge request dependencies - doc_url: 'user/project/merge_requests/merge_request_dependencies.html' - - doc_title: Fast forward - doc_url: 'user/project/merge_requests/fast_forward_merge.html' - - doc_title: Merge when pipeline succeeds - doc_url: 'user/project/merge_requests/merge_when_pipeline_succeeds.html' - - doc_title: Resolve conflicts - doc_url: 'user/project/merge_requests/resolve_conflicts.html' - - doc_title: Reverting changes - doc_url: 'user/project/merge_requests/revert_changes.html' - - doc_title: Reviewing and managing merge requests - doc_url: 'user/project/merge_requests/reviewing_and_managing_merge_requests.html' - - doc_title: Squash and merge - doc_url: 'user/project/merge_requests/squash_and_merge.html' - - doc_title: Versions - doc_url: 'user/project/merge_requests/versions.html' - - doc_title: Workflows - doc_url: 'user/project/merge_requests/authorization_for_merge_requests.html' - - doc_title: Work in progress - doc_url: 'user/project/merge_requests/drafts.html' - category_title: Members category_url: 'user/project/members/' - category_title: Migrating projects @@ -833,6 +800,40 @@ sections: - category_title: Zoom meetings in issues category_url: 'user/project/issues/associate_zoom_meeting.html' + - section_title: Merge requests + section_url: 'user/project/merge_requests/' + section_categories: + - category_title: Allow collaboration + category_url: 'user/project/merge_requests/allow_collaboration.html' + - category_title: Approvals + category_url: 'user/project/merge_requests/merge_request_approvals.html' + - category_title: Creating merge requests + category_url: 'user/project/merge_requests/creating_merge_requests.html' + - category_title: Cherry pick changes + category_url: 'user/project/merge_requests/cherry_pick_changes.html' + - category_title: Getting started + category_url: 'user/project/merge_requests/getting_started.html' + - category_title: Merge request dependencies + category_url: 'user/project/merge_requests/merge_request_dependencies.html' + - category_title: Fast forward + category_url: 'user/project/merge_requests/fast_forward_merge.html' + - category_title: Merge when pipeline succeeds + category_url: 'user/project/merge_requests/merge_when_pipeline_succeeds.html' + - category_title: Resolve conflicts + category_url: 'user/project/merge_requests/resolve_conflicts.html' + - category_title: Reverting changes + category_url: 'user/project/merge_requests/revert_changes.html' + - category_title: Reviewing and managing merge requests + category_url: 'user/project/merge_requests/reviewing_and_managing_merge_requests.html' + - category_title: Squash and merge + category_url: 'user/project/merge_requests/squash_and_merge.html' + - category_title: Versions + category_url: 'user/project/merge_requests/versions.html' + - category_title: Workflows + category_url: 'user/project/merge_requests/authorization_for_merge_requests.html' + - category_title: Work in progress + category_url: 'user/project/merge_requests/drafts.html' + - section_title: Operations section_url: 'operations/' section_categories: |