From 6b35c4ad65205391a054725e2bf0b86985895b86 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 17 Nov 2016 09:39:23 +0000 Subject: Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'" This reverts merge request !6796 --- app/services/projects/autocomplete_service.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'app/services/projects') 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) -- cgit v1.2.3