diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-11-10 13:23:44 +0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-11-29 03:24:19 +0300 |
| commit | 3d7704ae5f62446b8b399c796c64d1f527666376 (patch) | |
| tree | 05790324eef305e2c2198366c7faa3767b5db8d8 /app/services/issuable_base_service.rb | |
| parent | ec5d0472288cac599d76a27870804e86fe29ffaf (diff) | |
Merge branch 'zj-fix-label-creation-non-members' into 'security'
Fix label creation non members
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23416
See merge request !2006
Diffstat (limited to 'app/services/issuable_base_service.rb')
| -rw-r--r-- | app/services/issuable_base_service.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index d698b295e6d..ce68e433ab8 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -85,14 +85,15 @@ class IssuableBaseService < BaseService def find_or_create_label_ids labels = params.delete(:labels) + return unless labels - params[:label_ids] = labels.split(',').map do |label_name| + params[:label_ids] = labels.split(",").map do |label_name| service = Labels::FindOrCreateService.new(current_user, project, title: label_name.strip) label = service.execute - label.id - end + label.try(:id) + end.compact end def process_label_ids(attributes, existing_label_ids: nil) @@ -140,6 +141,7 @@ class IssuableBaseService < BaseService params.delete(:state_event) params[:author] ||= current_user + label_ids = process_label_ids(params) issuable.assign_attributes(params) |