diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
| commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
| tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/controllers/projects/protected_branches_controller.rb | |
| parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/controllers/projects/protected_branches_controller.rb')
| -rw-r--r-- | app/controllers/projects/protected_branches_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb index d4f7d0bc521..84b155c8002 100644 --- a/app/controllers/projects/protected_branches_controller.rb +++ b/app/controllers/projects/protected_branches_controller.rb @@ -21,6 +21,7 @@ class Projects::ProtectedBranchesController < Projects::ProtectedRefsController def protected_ref_params(*attrs) attrs = ([:name, + :allow_force_push, merge_access_levels_attributes: access_level_attributes, push_access_levels_attributes: access_level_attributes] + attrs).uniq |