From bdb6a908ebe33260a480703790e4f20dba05a88b Mon Sep 17 00:00:00 2001 From: Marcel Amirault <mamirault@gitlab.com> Date: Mon, 28 Oct 2019 01:44:47 +0900 Subject: [PATCH] Update links and front matter Fix links to moved content, and add front matter to new files. --- .../project/merge_requests/creating_merge_requests.md | 4 ++++ doc/user/project/merge_requests/index.md | 9 +++++---- .../reviewing_and_managing_merge_requests.md | 4 ++++ doc/user/project/settings/index.md | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md index 4e36eee79b9f5..941ceed824152 100644 --- a/doc/user/project/merge_requests/creating_merge_requests.md +++ b/doc/user/project/merge_requests/creating_merge_requests.md @@ -1,3 +1,7 @@ +--- +type: index, reference +--- + # Creating merge requests Merge requests are the primary method of making changes to files in a GitLab project. diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 44be5c11a88c2..e6fbd28ac9ddf 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -1,5 +1,5 @@ --- -type: index, reference, concepts +type: index, reference --- # Merge requests @@ -32,8 +32,9 @@ With GitLab merge requests, you can: While directly making changes to files in a branch of a repository is possible, it is not the common workflow. In most cases, a user will [create a merge request](creating_merge_requests.md), -which is then [reviewed](reviewing_and_managing_merge_requests.md), updated, approved and merged into the target branch. This is -especially true for merging changes from a feature branch into the master branch. +which is then [reviewed](reviewing_and_managing_merge_requests.md), updated, approved +and merged into the target branch. This is especially true for merging changes from +a feature branch into the master branch. [Creating merge requests](creating_merge_requests.md), as well as [reviewing and managing them](#reviewing-and-managing-merge-requests), is a fundamental part of working with GitLab. @@ -55,7 +56,7 @@ A large number of features relate directly to the merge request creation process | [Merge Requests for Confidential Issues](../issues/confidential_issues.md#merge-requests-for-confidential-issues) | Create merge requests to resolve confidential issues for preventing leakage or early release of sensitive data through regular merge requests. | | [Multiple assignees](creating_merge_requests.md#multiple-assignees-starter) **(STARTER)** | Have multiple assignees for merge requests to indicate everyone that is reviewing or accountable for it. | | [Security reports](../../application_security/index.md) **(ULTIMATE)** | GitLab can scan and report any vulnerabilities found in your project. | -| [Squash and merge](creating_merge_requests.md#squash-and-merge) | Squash all changes present in a merge request into a single commit when merging, to allow for a neater commit history. | +| [Squash and merge](squash_and_merge.md) | Squash all changes present in a merge request into a single commit when merging, to allow for a neater commit history. | | [View changes between file versions](creating_merge_requests.md#view-changes-between-file-versions) | | | [Work In Progress merge requests](work_in_progress_merge_requests.md) | Prevent the merge request from being merged before it's ready | diff --git a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md index 69464138c45bb..88a22abc7d254 100644 --- a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md +++ b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md @@ -1,3 +1,7 @@ +--- +type: index, reference +--- + # Reviewing and managing merge requests Merge requests are the primary method of making changes to files in a GitLab project. diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 7c8ae2702a253..2dc507901d0f0 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -53,7 +53,7 @@ Set up your project's merge request settings: - Enable [merge request approvals](../merge_requests/merge_request_approvals.md). **(STARTER)** - Enable [merge only if pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md). - Enable [merge only when all threads are resolved](../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved). -- Enable [`delete source branch after merge` option by default](../merge_requests/index.md#deleting-the-source-branch) +- Enable [`delete source branch after merge` option by default](../merge_requests/creating_merge_requests.md#deleting-the-source-branch)  -- GitLab