diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/services/labels | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/services/labels')
-rw-r--r-- | app/services/labels/available_labels_service.rb | 6 | ||||
-rw-r--r-- | app/services/labels/create_service.rb | 2 | ||||
-rw-r--r-- | app/services/labels/promote_service.rb | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/app/services/labels/available_labels_service.rb b/app/services/labels/available_labels_service.rb index 8886e58d6ef..979964e09fd 100644 --- a/app/services/labels/available_labels_service.rb +++ b/app/services/labels/available_labels_service.rb @@ -30,11 +30,13 @@ module Labels end def filter_labels_ids_in_param(key) - return [] if params[key].to_a.empty? + ids = params[key].to_a + return [] if ids.empty? # rubocop:disable CodeReuse/ActiveRecord - available_labels.by_ids(params[key]).pluck(:id) + existing_ids = available_labels.by_ids(ids).pluck(:id) # rubocop:enable CodeReuse/ActiveRecord + ids.map(&:to_i) & existing_ids end private diff --git a/app/services/labels/create_service.rb b/app/services/labels/create_service.rb index c032985be42..a5b30e29e55 100644 --- a/app/services/labels/create_service.rb +++ b/app/services/labels/create_service.rb @@ -20,7 +20,7 @@ module Labels label.save label else - Rails.logger.warn("target_params should contain :project or :group or :template, actual value: #{target_params}") # rubocop:disable Gitlab/RailsLogger + Gitlab::AppLogger.warn("target_params should contain :project or :group or :template, actual value: #{target_params}") end end end diff --git a/app/services/labels/promote_service.rb b/app/services/labels/promote_service.rb index cc91fd4b4d2..9ed10f6a11b 100644 --- a/app/services/labels/promote_service.rb +++ b/app/services/labels/promote_service.rb @@ -90,7 +90,7 @@ module Labels # rubocop: disable CodeReuse/ActiveRecord def destroy_project_labels(label_ids) - Label.where(id: label_ids).destroy_all # rubocop: disable DestroyAll + Label.where(id: label_ids).destroy_all # rubocop: disable Cop/DestroyAll end # rubocop: enable CodeReuse/ActiveRecord |