From 8eb503d252eb9d67c28ad81186174c250818ead7 Mon Sep 17 00:00:00 2001 From: Amy Qualls Date: Fri, 13 May 2022 14:19:40 -0700 Subject: Add new subsection for merge methods Now that we have a page for merge methods, let's add a nav entry for it, and move the two related pages underneath it. --- content/_data/navigation.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/content/_data/navigation.yaml b/content/_data/navigation.yaml index a0d43e45..74457544 100644 --- a/content/_data/navigation.yaml +++ b/content/_data/navigation.yaml @@ -1435,12 +1435,17 @@ 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: Fast forward + doc_url: 'ee/user/project/merge_requests/fast_forward_merge.html' + - 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 @@ -1452,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 -- cgit v1.2.3