From 490cf7bfcefdb2e275c537699717c12e440f57ec Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 3 Feb 2015 18:12:20 -0800
Subject: [PATCH] Improve protected branches selectbox options
---
lib/gitlab/access.rb | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/gitlab/access.rb b/lib/gitlab/access.rb
index ad05bfadafe..424541b4a04 100644
--- a/lib/gitlab/access.rb
+++ b/lib/gitlab/access.rb
@@ -50,12 +50,13 @@ module Gitlab
end
def protection_options
- {
- "None" => PROTECTION_NONE,
- "Protect, developers can push" => PROTECTION_DEV_CAN_PUSH,
- "Full protection" => PROTECTION_FULL,
- }
+ {
+ "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,
+ }
end
+
def protection_values
protection_options.values
end
--
GitLab