diff options
| author | Kati Paizee <kpaizee@gitlab.com> | 2022-05-17 17:03:36 +0300 |
|---|---|---|
| committer | Kati Paizee <kpaizee@gitlab.com> | 2022-05-17 17:03:36 +0300 |
| commit | ceace67b9dcd32d3f3f6408b1e8dac3bc685bec7 (patch) | |
| tree | a92322f6139abcc63a41af17ed217a70c458e048 | |
| parent | 1c0a0f0d99b8d918ee32f220e7eb2489c2de2b78 (diff) | |
| parent | 80c66b5f69f01a90b7ccd74e26a2f3c41bc7956a (diff) | |
Merge branch 'aqualls-merge-options-improve' into 'main'
Add new subsection for merge methods
See merge request gitlab-org/gitlab-docs!2659
| -rw-r--r-- | content/_data/navigation.yaml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/content/_data/navigation.yaml b/content/_data/navigation.yaml index 3568da14..d3e8c45b 100644 --- a/content/_data/navigation.yaml +++ b/content/_data/navigation.yaml @@ -1437,12 +1437,15 @@ sections: doc_url: 'ee/user/project/merge_requests/csv_export.html' - doc_title: External status checks doc_url: 'ee/user/project/merge_requests/status_checks.html' + - doc_title: Merge methods + doc_url: 'ee/user/project/merge_requests/methods/' + docs: + - doc_title: Squash and merge + doc_url: 'ee/user/project/merge_requests/squash_and_merge.html' - doc_title: Merge request dependencies doc_url: 'ee/user/project/merge_requests/merge_request_dependencies.html' - doc_title: Merge request widgets doc_url: 'ee/user/project/merge_requests/widgets.html' - - doc_title: Fast forward - doc_url: 'ee/user/project/merge_requests/fast_forward_merge.html' - doc_title: Merge when pipeline succeeds doc_url: 'ee/user/project/merge_requests/merge_when_pipeline_succeeds.html' - doc_title: Merge conflicts @@ -1454,8 +1457,6 @@ sections: docs: - doc_title: Suggestions doc_url: 'ee/user/project/merge_requests/reviews/suggestions.html' - - doc_title: Squash and merge - doc_url: 'ee/user/project/merge_requests/squash_and_merge.html' - doc_title: Versions doc_url: 'ee/user/project/merge_requests/versions.html' - doc_title: Workflows |