diff options
author | Chantal Rollison <crollison@gitlab.com> | 2018-05-31 07:37:00 -0700 |
---|---|---|
committer | Chantal Rollison <crollison@gitlab.com> | 2018-06-01 09:24:19 -0700 |
commit | 458b5a10ddb4432f1abd5cb0e1b92fc591f4e966 (patch) | |
tree | 97e10caf55f9b9fcd7c155bc09583a3cdfabe739 /app | |
parent | 68afa03a0dcd241ba44f375a8af6f86effad4f1c (diff) | |
download | gitlab-ce-458b5a10ddb4432f1abd5cb0e1b92fc591f4e966.tar.gz |
Backport of 5942-extract-ee-specific-filesccr/extract_EE_code_5942
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index c925b4aada5..d04eb192129 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -7,6 +7,19 @@ module IssuableActions before_action :authorize_admin_issuable!, only: :bulk_update 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 @@ -140,24 +153,15 @@ module IssuableActions end def bulk_update_params - permitted_keys = [ - :issuable_ids, - :assignee_id, - :milestone_id, - :state_event, - :subscription_event, - label_ids: [], - add_label_ids: [], - remove_label_ids: [] - ] + permitted_keys_array = permitted_keys.dup if resource_name == 'issue' - permitted_keys << { assignee_ids: [] } + permitted_keys_array << { assignee_ids: [] } else - permitted_keys.unshift(:assignee_id) + permitted_keys_array.unshift(:assignee_id) end - params.require(:update).permit(permitted_keys) + params.require(:update).permit(permitted_keys_array) end def resource_name |