summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbikebilly <fabio@gitlab.com>2017-09-06 16:33:09 +0200
committerbikebilly <fabio@gitlab.com>2017-09-06 16:33:09 +0200
commitc52dc9fd2adcb7026843005968c0a490a35b632e (patch)
tree081f32ceafd5dbd573d9217237ca40d02f53c7a6
parentcce1cd609d47e3c056295c1039c36b4e84066d09 (diff)
downloadgitlab-ce-add-security-on-protected-branches.tar.gz
Add reference in the permission pageadd-security-on-protected-branches
-rw-r--r--doc/user/permissions.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index bd0a58c4cca..0c17905aa8c 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -230,6 +230,14 @@ users:
GitLab 8.12 has a completely redesigned job permissions system. To learn more,
read through the documentation on the [new CI/CD permissions model](project/new_ci_build_permissions_model.md#new-ci-job-permissions-model).
+## Running pipelines on protected branches
+
+The permission to merge or push to protected branches is used to define if a user can
+run CI/CD pipelines and execute actions on jobs that are related to those branches.
+
+See [Security on protected branches](../ci/pipelines.md#security-on-protected-branches)
+for details about the pipelines security model.
+
## LDAP users permissions
Since GitLab 8.15, LDAP user permissions can now be manually overridden by an admin user.