diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-12 12:29:29 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-12 12:29:29 +0300 |
commit | f938f9441b908ed90c519f1ad208c68dcfb2dde2 (patch) | |
tree | 0601d914c1012d753b0d0391a9b19d0b3b5b866b /app/controllers | |
parent | 20987f4fd2d6a5ab27e61a4afc038999937adade (diff) | |
parent | 22722659c233efb3b65bb35286ff07c192e3fc85 (diff) |
Merge branch 'fixes_for_multiple_issue_assignees' into 'master'
Fix for Follow-up from "Backport of Multiple Assignees feature
Closes #31888
See merge request !11178
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index b199f18da1e..4cf645d6341 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -60,17 +60,24 @@ module IssuableActions end def bulk_update_params - params.require(:update).permit( + permitted_keys = [ :issuable_ids, :assignee_id, :milestone_id, :state_event, :subscription_event, - assignee_ids: [], label_ids: [], add_label_ids: [], remove_label_ids: [] - ) + ] + + if resource_name == 'issue' + permitted_keys << { assignee_ids: [] } + else + permitted_keys.unshift(:assignee_id) + end + + params.require(:update).permit(permitted_keys) end def resource_name |