summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
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/controllers/projects_controller.rb
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/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 7376c2bfeb7..a8a18b4fa16 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -144,15 +144,13 @@ class ProjectsController < Projects::ApplicationController
autocomplete = ::Projects::AutocompleteService.new(@project, current_user)
participants = ::Projects::ParticipantsService.new(@project, current_user).execute(noteable)
- unlabels = autocomplete.unlabels(noteable)
@suggestions = {
emojis: Gitlab::AwardEmoji.urls,
issues: autocomplete.issues,
milestones: autocomplete.milestones,
mergerequests: autocomplete.merge_requests,
- labels: autocomplete.labels - unlabels,
- unlabels: unlabels,
+ labels: autocomplete.labels,
members: participants,
commands: autocomplete.commands(noteable, params[:type])
}