diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-01 18:08:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-01 18:08:07 +0000 |
| commit | d7ed3b4766871c30f50736c1d9eedc46c4035841 (patch) | |
| tree | 72d0b5652364973c9bc3df5bf710a00fa1432b09 /app/services/issuable | |
| parent | 711f8595324430e216ba62f874e7db9fdf482f73 (diff) | |
| download | gitlab-ce-d7ed3b4766871c30f50736c1d9eedc46c4035841.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/issuable')
| -rw-r--r-- | app/services/issuable/bulk_update_service.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/services/issuable/bulk_update_service.rb b/app/services/issuable/bulk_update_service.rb index 2cd0e1e992d..1518b697f86 100644 --- a/app/services/issuable/bulk_update_service.rb +++ b/app/services/issuable/bulk_update_service.rb @@ -40,9 +40,13 @@ module Issuable private def permitted_attrs(type) - attrs = %i(state_event milestone_id assignee_id assignee_ids add_label_ids remove_label_ids subscription_event) + attrs = %i(state_event milestone_id add_label_ids remove_label_ids subscription_event) - if type == 'issue' + issuable_specific_attrs(type, attrs) + end + + def issuable_specific_attrs(type, attrs) + if type == 'issue' || type == 'merge_request' attrs.push(:assignee_ids) else attrs.push(:assignee_id) |