Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'doc/workflow/authorization_for_merge_requests.md')
-rw-r--r--doc/workflow/authorization_for_merge_requests.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/workflow/authorization_for_merge_requests.md b/doc/workflow/authorization_for_merge_requests.md
index cc7031b11e1..d1d6d94ec11 100644
--- a/doc/workflow/authorization_for_merge_requests.md
+++ b/doc/workflow/authorization_for_merge_requests.md
@@ -5,9 +5,13 @@ There are two main ways to have a merge request flow with GitLab: working with p
## Protected branch flow
With the protected branch flow everybody works within the same GitLab project.
+
The project maintainers get Master access and the regular developers get Developer access.
+
The maintainers mark the authoritative branches as 'Protected'.
+
The developers push feature branches to the project and create merge requests to have their feature branches reviewed and merged into one of the protected branches.
+
Only users with Master access can merge changes into a protected branch.
### Advantages
@@ -22,7 +26,9 @@ Only users with Master access can merge changes into a protected branch.
## Forking workflow
With the forking workflow the maintainers get Master access and the regular developers get Reporter access to the authoritative repository, which prohibits them from pushing any changes to it.
+
Developers create forks of the authoritative project and push their feature branches to their own forks.
+
To get their changes into master they need to create a merge request across forks.
### Advantages