diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:16:56 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:16:56 +0200 |
| commit | 2cf7f09b1e9ccb000433374a42bd7b33b73f8116 (patch) | |
| tree | 743e4ed2a6f2739541891749a6ef31bfd09e6805 /lib/gitlab/access.rb | |
| parent | 1266e2664e7b080b440f5fc004424418284ee87b (diff) | |
| download | gitlab-ce-2cf7f09b1e9ccb000433374a42bd7b33b73f8116.tar.gz | |
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'
""
This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50.
See !4892.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/gitlab/access.rb')
| -rw-r--r-- | lib/gitlab/access.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/access.rb b/lib/gitlab/access.rb index 831f1e635ba..de41ea415a6 100644 --- a/lib/gitlab/access.rb +++ b/lib/gitlab/access.rb @@ -14,9 +14,10 @@ module Gitlab OWNER = 50 # Branch protection settings - PROTECTION_NONE = 0 - PROTECTION_DEV_CAN_PUSH = 1 - PROTECTION_FULL = 2 + PROTECTION_NONE = 0 + PROTECTION_DEV_CAN_PUSH = 1 + PROTECTION_FULL = 2 + PROTECTION_DEV_CAN_MERGE = 3 class << self def values @@ -54,6 +55,7 @@ module Gitlab def protection_options { "Not protected: Both developers and masters can push new commits, force push, or delete the branch." => PROTECTION_NONE, + "Protected against pushes: Developers cannot push new commits, but are allowed to accept merge requests to the branch." => PROTECTION_DEV_CAN_MERGE, "Partially protected: Developers can push new commits, but cannot force push or delete the branch. Masters can do all of those." => PROTECTION_DEV_CAN_PUSH, "Fully protected: Developers cannot push new commits, force push, or delete the branch. Only masters can do any of those." => PROTECTION_FULL, } |