summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2016-09-15 06:20:00 +0200
committerGitHub <noreply@github.com>2016-09-15 06:20:00 +0200
commit1e1d467c9570f75027e45ec461e808617df6c0fa (patch)
tree62889b4e0e78a431b91d1f464e966d8e6d662f23
parentddba752eb20af39fa54e13a7f565108a4ad011e9 (diff)
parent8a560c6ada94ec715e36b47ba722d5a128a4e154 (diff)
downloadgitlab-1e1d467c9570f75027e45ec461e808617df6c0fa.tar.gz
Merge pull request #150 from vilhelmen/master
Add branch protection notes
-rw-r--r--docs/gl_objects/branches.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/gl_objects/branches.rst b/docs/gl_objects/branches.rst
index 1b61af3..50b97a7 100644
--- a/docs/gl_objects/branches.rst
+++ b/docs/gl_objects/branches.rst
@@ -41,3 +41,10 @@ Protect/unprotect a repository branch:
.. literalinclude:: branches.py
:start-after: # protect
:end-before: # end protect
+
+.. note::
+
+ By default, developers will not be able to push or merge into
+ protected branches. This can be changed by passing ``developers_can_push``
+ or ``developers_can_merge`` like so:
+ ``branch.protect(developers_can_push=False, developers_can_merge=True)``