diff options
| author | Evan Read <eread@gitlab.com> | 2019-09-12 02:29:57 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-09-12 02:29:57 +0000 |
| commit | b3d5dac9c03c207f7bb007154657f779caa8d1a8 (patch) | |
| tree | 964a5145ab468903abee7a904d521c5f405f1d2b | |
| parent | 5587ccfdc232648fb15dd2b98e5341b43012a2a6 (diff) | |
| parent | cf65b4c56a69ff2ba5a39dbc0b5730097e93d471 (diff) | |
| download | gitlab-ce-b3d5dac9c03c207f7bb007154657f779caa8d1a8.tar.gz | |
Merge branch 'docs-permissions-clarify-mpenna20190906' into 'master'
Docs: Clarified permissions of protected branches
See merge request gitlab-org/gitlab-ce!32785
| -rw-r--r-- | doc/user/permissions.md | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 07a30fa5a93..46a3090e268 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -152,13 +152,9 @@ which visibility level you select on project settings. ### Protected branches -To prevent people from messing with history or pushing code without -review, we've created protected branches. Read through the documentation on -[protected branches](project/protected_branches.md) -to learn more. - -Additionally, you can allow or forbid users with Maintainer and/or -Developer permissions to push to a protected branch. Read through the documentation on +Additional restrictions can be applied on a per-branch basis with [protected branches](project/protected_branches.md). +Additionally, you can customize permissions to allow or prevent project +Maintainers and Developers from pushing to a protected branch. Read through the documentation on [Allowed to Merge and Allowed to Push settings](project/protected_branches.md#using-the-allowed-to-merge-and-allowed-to-push-settings) to learn more. |