GitLab wurde erfolgreich aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Danke für Ihre Geduld.

Commit 3094f1c1 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'ccr/extract_EE_code_5942' into 'master'

Backport of 5942-extract-ee-specific-files

See merge request gitlab-org/gitlab-ce!19285
parents 428bbc92 458b5a10
......@@ -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 @@ def authorize_update_issuable!
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment