diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-11-20 16:09:56 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-11-20 16:09:56 +0000 |
| commit | c82ae26565fdbffd205476929a2c08c9448a1365 (patch) | |
| tree | 410f26b3f7307b7ff246402f62612832e1eb6d7b /lib/gitlab/access.rb | |
| parent | 4b78f70fc4c9b7f807db497e4ced12a92744bc3e (diff) | |
| download | gitlab-ce-c82ae26565fdbffd205476929a2c08c9448a1365.tar.gz | |
Clarify wording of protected branch settings for the default branch
No-one is allowed to force push to a protected branch, or delete it. That's
correct in the documentation, but was wrong in the drop-down.
Diffstat (limited to 'lib/gitlab/access.rb')
| -rw-r--r-- | lib/gitlab/access.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/access.rb b/lib/gitlab/access.rb index b4012ebbb99..7127948cf00 100644 --- a/lib/gitlab/access.rb +++ b/lib/gitlab/access.rb @@ -58,9 +58,9 @@ 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 + "Protected against pushes: Developers cannot push new commits, but are allowed to accept merge requests to the branch. Masters can push to the branch." => PROTECTION_DEV_CAN_MERGE, + "Partially protected: Both developers and masters can push new commits, but cannot force push or delete the branch." => PROTECTION_DEV_CAN_PUSH, + "Fully protected: Developers cannot push new commits, but masters can. No-one can force push or delete the branch." => PROTECTION_FULL } end |