diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2014-12-26 09:14:53 +0100 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2014-12-26 09:14:53 +0100 |
| commit | b7eb0d178e2a1e951ba6e110ad703def3fb35357 (patch) | |
| tree | 2f4b27fc329f5c5ab996b28365496830dbdff051 /app | |
| parent | 6ce3b1a31174a9f09dd34c114c7fb13d898db6ec (diff) | |
| download | gitlab-ce-b7eb0d178e2a1e951ba6e110ad703def3fb35357.tar.gz | |
Add checkbox for protected branch developer can push to.
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/protected_branches_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/protected_branches/index.html.haml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb index bd31b1d3c54..a0df392e424 100644 --- a/app/controllers/projects/protected_branches_controller.rb +++ b/app/controllers/projects/protected_branches_controller.rb @@ -27,6 +27,6 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController private def protected_branch_params - params.require(:protected_branch).permit(:name) + params.require(:protected_branch).permit(:name, :developers_can_push) end end diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml index 227a2f9a061..2d04c572c73 100644 --- a/app/views/projects/protected_branches/index.html.haml +++ b/app/views/projects/protected_branches/index.html.haml @@ -22,6 +22,10 @@ = f.label :name, "Branch", class: 'control-label' .col-sm-10 = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "select2"}) + .form-group + = f.label :developers_can_push, "Developers can push?", class: 'control-label' + .col-sm-10 + = f.check_box :developers_can_push .form-actions = f.submit 'Protect', class: "btn-create btn" - unless @branches.empty? |