diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-05-22 19:54:50 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-06 20:57:15 +0900 |
| commit | cfcc7043fe614cbc5fc82f3021a0c4cd8519e24b (patch) | |
| tree | c00f507cb85b0beffb65c1af5a2c2d0eb35946e0 /doc | |
| parent | a8b570d8bced794dcb8f6f3a1155360038d76a66 (diff) | |
| download | gitlab-ce-cfcc7043fe614cbc5fc82f3021a0c4cd8519e24b.tar.gz | |
Rename “Developers + Masters”
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/protected_branches.md | 4 | ||||
| -rw-r--r-- | doc/user/project/protected_branches.md | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/api/protected_branches.md b/doc/api/protected_branches.md index 950ead52560..b4e891c915a 100644 --- a/doc/api/protected_branches.md +++ b/doc/api/protected_branches.md @@ -115,13 +115,13 @@ Example response: "push_access_levels": [ { "access_level": 30, - "access_level_description": "Developers + Masters" + "access_level_description": "Developers + Maintainers" } ], "merge_access_levels": [ { "access_level": 30, - "access_level_description": "Developers + Masters" + "access_level_description": "Developers + Maintainers" } ] } diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md index 0cbb0c878c2..72593284648 100644 --- a/doc/user/project/protected_branches.md +++ b/doc/user/project/protected_branches.md @@ -50,14 +50,14 @@ allow/prohibit Masters and/or Developers to push to a protected branch. Using the "Allowed to push" and "Allowed to merge" settings, you can control the actions that different roles can perform with the protected branch. For example, you could set "Allowed to push" to "No one", and "Allowed to merge" -to "Developers + Masters", to require _everyone_ to submit a merge request for +to "Developers + Maintainers", to require _everyone_ to submit a merge request for changes going into the protected branch. This is compatible with workflows like the [GitLab workflow](../../workflow/gitlab_flow.md). However, there are workflows where that is not needed, and only protecting from force pushes and branch removal is useful. For those workflows, you can allow everyone with write access to push to a protected branch by setting -"Allowed to push" to "Developers + Masters". +"Allowed to push" to "Developers + Maintainers". You can set the "Allowed to push" and "Allowed to merge" options while creating a protected branch or afterwards by selecting the option you want from the |