diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-06-09 22:25:13 +0000 |
---|---|---|
committer | Mike Lewis <mlewis@gitlab.com> | 2019-06-09 22:25:13 +0000 |
commit | fb9f1e92ed31a2b49e554cb8a677cb6faeeae7f5 (patch) | |
tree | 29ec109575f52696b12d1412ec27f600b58228ab /doc/user/project/merge_requests/authorization_for_merge_requests.md | |
parent | f4294e992fbf73664086141b31cd8c6a6048d8d6 (diff) | |
download | gitlab-ce-fb9f1e92ed31a2b49e554cb8a677cb6faeeae7f5.tar.gz |
Single source of truth for merge requests
- Edit pages under user/project/merge_requests and
add the relevant types in the frontmatter.
- Clean up descriptions.
Based on https://gitlab.com/groups/gitlab-org/-/epics/1280
Diffstat (limited to 'doc/user/project/merge_requests/authorization_for_merge_requests.md')
-rw-r--r-- | doc/user/project/merge_requests/authorization_for_merge_requests.md | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/doc/user/project/merge_requests/authorization_for_merge_requests.md b/doc/user/project/merge_requests/authorization_for_merge_requests.md index 79444ee5682..0579e3568da 100644 --- a/doc/user/project/merge_requests/authorization_for_merge_requests.md +++ b/doc/user/project/merge_requests/authorization_for_merge_requests.md @@ -1,8 +1,12 @@ +--- +type: concepts +--- + # Authorization for Merge requests There are two main ways to have a merge request flow with GitLab: -1. Working with [protected branches] in a single repository. +1. Working with [protected branches](../protected_branches.md) in a single repository. 1. Working with forks of an authoritative project. ## Protected branch flow @@ -53,4 +57,14 @@ forks. - The project need to keep their forks up to date, which requires more advanced Git skills (managing multiple remotes). -[protected branches]: ../protected_branches.md +<!-- ## Troubleshooting + +Include any troubleshooting steps that you can foresee. If you know beforehand what issues +one might have when setting this up, or when something is changed, or on upgrading, it's +important to describe those, too. Think of things that may go wrong and include them here. +This is important to minimize requests for support, and to avoid doc comments with +questions that you know someone might ask. + +Each scenario can be a third-level heading, e.g. `### Getting error message X`. +If you have none to add when creating a doc, leave this section in place +but commented out to help encourage others to add to it in the future. --> |