diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:16:56 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:16:56 +0200 |
| commit | 2cf7f09b1e9ccb000433374a42bd7b33b73f8116 (patch) | |
| tree | 743e4ed2a6f2739541891749a6ef31bfd09e6805 /app/controllers | |
| parent | 1266e2664e7b080b440f5fc004424418284ee87b (diff) | |
| download | gitlab-ce-2cf7f09b1e9ccb000433374a42bd7b33b73f8116.tar.gz | |
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'
""
This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50.
See !4892.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers')
| -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 80dad758afa..10dca47fded 100644 --- a/app/controllers/projects/protected_branches_controller.rb +++ b/app/controllers/projects/protected_branches_controller.rb @@ -50,6 +50,6 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController end def protected_branch_params - params.require(:protected_branch).permit(:name, :developers_can_push) + params.require(:protected_branch).permit(:name, :developers_can_push, :developers_can_merge) end end |