summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-11-17 09:39:23 +0000
committerDouwe Maan <douwe@gitlab.com>2016-11-17 09:39:23 +0000
commit6b35c4ad65205391a054725e2bf0b86985895b86 (patch)
treecee09fe391651f4356e7841fd0415f44cdb5afbb /app/services
parent11ba759d33b3f59b1dd493ab04dd75f447c0d374 (diff)
downloadgitlab-ce-6b35c4ad65205391a054725e2bf0b86985895b86.tar.gz
Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'"revert-0a3cafb2
This reverts merge request !6796
Diffstat (limited to 'app/services')
-rw-r--r--app/services/projects/autocomplete_service.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb
index 223461e88b6..015f2828921 100644
--- a/app/services/projects/autocomplete_service.rb
+++ b/app/services/projects/autocomplete_service.rb
@@ -13,14 +13,7 @@ module Projects
end
def labels
- LabelsFinder.new(current_user, project_id: project.id).execute.
- pluck(:title, :color).map { |l| { title: l.first, color: l.second } }
- end
-
- def unlabels(noteable)
- return [] unless noteable && noteable.respond_to?(:labels)
-
- noteable.labels.pluck(:title, :color).map { |l| { title: l.first, color: l.second } }
+ LabelsFinder.new(current_user, project_id: project.id).execute.select([:title, :color])
end
def commands(noteable, type)