diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-07-07 13:48:07 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-07-29 12:50:39 +0300 |
| commit | ab6096c17261605d835a4a8edae21f31d90026df (patch) | |
| tree | 0a4490cc0a62b86bf240fbc5bdff709b2e8d11b0 /app/controllers/projects/protected_branches_controller.rb | |
| parent | f8a04e15371815ad39e2c66056db4ab0439555f4 (diff) | |
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/controllers/projects/protected_branches_controller.rb')
| -rw-r--r-- | app/controllers/projects/protected_branches_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb index fdbe0044d3c..126358bfe77 100644 --- a/app/controllers/projects/protected_branches_controller.rb +++ b/app/controllers/projects/protected_branches_controller.rb @@ -56,7 +56,7 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController end def protected_branch_params - params.require(:protected_branch).permit(:name, :developers_can_push, :developers_can_merge) + params.require(:protected_branch).permit(:name, :allowed_to_push, :allowed_to_merge) end def load_protected_branches |