diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 12:08:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 12:08:58 +0000 |
| commit | c9ca178ba4c9a3e48d9d069f7d7486a29827cc61 (patch) | |
| tree | 07a4f84921b80ff967d30229f0d887c152b9b1d8 /app/controllers/dashboard | |
| parent | 6035fcc36ead3b415fa2422b0204a795a70f3e2f (diff) | |
| download | gitlab-ce-c9ca178ba4c9a3e48d9d069f7d7486a29827cc61.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/dashboard')
| -rw-r--r-- | app/controllers/dashboard/labels_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/dashboard/labels_controller.rb b/app/controllers/dashboard/labels_controller.rb index e3773f65744..b661efa12c0 100644 --- a/app/controllers/dashboard/labels_controller.rb +++ b/app/controllers/dashboard/labels_controller.rb @@ -11,8 +11,8 @@ class Dashboard::LabelsController < Dashboard::ApplicationController def labels finder_params = { project_ids: projects.select(:id) } - labels = LabelsFinder.new(current_user, finder_params).execute - GlobalLabel.build_collection(labels) + LabelsFinder.new(current_user, finder_params).execute + .select('DISTINCT ON (labels.title) labels.*') end end |