Skip to content
Snippets Groups Projects
Commit 458b5a10 authored by Chantal Rollison's avatar Chantal Rollison
Browse files

Backport of 5942-extract-ee-specific-files

parent 68afa03a
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment