diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-10-29 21:35:05 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-10-29 21:35:05 +0300 |
| commit | 6c5154b5bcb892864a4158e0554a0e13549a7e7c (patch) | |
| tree | 7d53cca8708de8b626550adf16e1012b43575200 /app/services | |
| parent | 684ba98b7bae9a1d31cb1ce643d15a3add6753eb (diff) | |
| parent | db80db793f43f9b4367730fc9b95c1925807f999 (diff) | |
Merge branch 'rails5-deprecated-uniq' into 'master'
Replace deprecated uniq on a Relation with distinct
See merge request gitlab-org/gitlab-ce!22625
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/delete_merged_branches_service.rb | 4 | ||||
| -rw-r--r-- | app/services/labels/transfer_service.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/delete_merged_branches_service.rb b/app/services/delete_merged_branches_service.rb index ced87a1c37a..80de897e94b 100644 --- a/app/services/delete_merged_branches_service.rb +++ b/app/services/delete_merged_branches_service.rb @@ -24,8 +24,8 @@ class DeleteMergedBranchesService < BaseService # rubocop: disable CodeReuse/ActiveRecord def merge_request_branch_names # reorder(nil) is necessary for SELECT DISTINCT because default scope adds an ORDER BY - source_names = project.origin_merge_requests.opened.reorder(nil).uniq.pluck(:source_branch) - target_names = project.merge_requests.opened.reorder(nil).uniq.pluck(:target_branch) + source_names = project.origin_merge_requests.opened.reorder(nil).distinct.pluck(:source_branch) + target_names = project.merge_requests.opened.reorder(nil).distinct.pluck(:target_branch) (source_names + target_names).uniq end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/services/labels/transfer_service.rb b/app/services/labels/transfer_service.rb index 52360f775dc..9cbc9fef529 100644 --- a/app/services/labels/transfer_service.rb +++ b/app/services/labels/transfer_service.rb @@ -40,7 +40,7 @@ module Labels group_labels_applied_to_merge_requests ]) .reorder(nil) - .uniq + .distinct end # rubocop: enable CodeReuse/ActiveRecord |