summaryrefslogtreecommitdiff
path: root/app/models/protected_branch
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-07-07 16:18:07 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-07-29 15:20:39 +0530
commitab6096c17261605d835a4a8edae21f31d90026df (patch)
tree0a4490cc0a62b86bf240fbc5bdff709b2e8d11b0 /app/models/protected_branch
parentf8a04e15371815ad39e2c66056db4ab0439555f4 (diff)
downloadgitlab-ce-ab6096c17261605d835a4a8edae21f31d90026df.tar.gz
Add "No One Can Push" to the protected branches UI.
1. Move to dropdowns instead of checkboxes. One each for "Allowed to Push" and "Allowed to Merge" 2. Refactor the `ProtectedBranches` coffeescript class into `ProtectedBranchesAccessSelect`. 3. Modify the backend to accept the new parameters.
Diffstat (limited to 'app/models/protected_branch')
-rw-r--r--app/models/protected_branch/push_access_level.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/protected_branch/push_access_level.rb b/app/models/protected_branch/push_access_level.rb
index 4345dc4ede4..8861632c055 100644
--- a/app/models/protected_branch/push_access_level.rb
+++ b/app/models/protected_branch/push_access_level.rb
@@ -1,5 +1,5 @@
class ProtectedBranch::PushAccessLevel < ActiveRecord::Base
belongs_to :protected_branch
- enum access_level: [:masters, :developers]
+ enum access_level: [:masters, :developers, :no_one]
end