summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-12 12:38:42 +0200
committerDouwe Maan <douwe@gitlab.com>2015-05-13 09:41:55 +0200
commit9eb45ccd552c7c0a3c2104f01e86120d7c9f4060 (patch)
treec5bc6d5a76dcf9e13d7c0e7265ff59c9b86d576d /lib
parent1f72c387c97fdf08b5736c8f23a01d047bb8e512 (diff)
downloadgitlab-ce-9eb45ccd552c7c0a3c2104f01e86120d7c9f4060.tar.gz
Improve description of branch protection levels.
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/access.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/access.rb b/lib/gitlab/access.rb
index 424541b4a04..6d0e30e916f 100644
--- a/lib/gitlab/access.rb
+++ b/lib/gitlab/access.rb
@@ -51,9 +51,9 @@ module Gitlab
def protection_options
{
- "Not protected, developers and masters can (force) push and delete the branch" => PROTECTION_NONE,
- "Partially protected, developers can also push but prevent all force pushes and deletion" => PROTECTION_DEV_CAN_PUSH,
- "Fully protected, only masters can push and prevent all force pushes and deletion" => PROTECTION_FULL,
+ "Not protected: Both developers and masters can push new commits, force push, or delete the branch." => PROTECTION_NONE,
+ "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,
}
end