diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/controllers/concerns/issuable_actions.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/controllers/concerns/issuable_actions.rb')
-rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index 0b1b3f2bcba..98fa8202e25 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -16,19 +16,6 @@ module IssuableActions end end - def permitted_keys - [ - :issuable_ids, - :assignee_id, - :milestone_id, - :state_event, - :subscription_event, - label_ids: [], - add_label_ids: [], - remove_label_ids: [] - ] - end - def show respond_to do |format| format.html do @@ -221,10 +208,20 @@ module IssuableActions end def bulk_update_params - permitted_keys_array = permitted_keys.dup - permitted_keys_array << { assignee_ids: [] } + params.require(:update).permit(bulk_update_permitted_keys) + end - params.require(:update).permit(permitted_keys_array) + def bulk_update_permitted_keys + [ + :issuable_ids, + :assignee_id, + :milestone_id, + :state_event, + :subscription_event, + assignee_ids: [], + add_label_ids: [], + remove_label_ids: [] + ] end def resource_name |