summaryrefslogtreecommitdiff
path: root/app/controllers/dashboard
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-09-19 17:21:39 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 14:58:24 -0200
commit398ab263fd08a5d9d7b19c5b3d06f33814a474eb (patch)
tree5a7249f72bdec65e87abb597f22a68afa9fb9f74 /app/controllers/dashboard
parentd5a595b59702489c0b1026a0951157b8cfd3d65c (diff)
downloadgitlab-ce-398ab263fd08a5d9d7b19c5b3d06f33814a474eb.tar.gz
Allow users to apply group labels on Issues/MRs
Diffstat (limited to 'app/controllers/dashboard')
-rw-r--r--app/controllers/dashboard/labels_controller.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/dashboard/labels_controller.rb b/app/controllers/dashboard/labels_controller.rb
index 2a88350a4ca..797f8503b2d 100644
--- a/app/controllers/dashboard/labels_controller.rb
+++ b/app/controllers/dashboard/labels_controller.rb
@@ -1,6 +1,9 @@
class Dashboard::LabelsController < Dashboard::ApplicationController
def index
- labels = Label.where(project_id: projects).select(:id, :title, :color).uniq(:title)
+ labels = LabelsFinder.new(current_user, project_id: projects)
+ .execute
+ .select(:id, :title, :color)
+ .uniq(:title)
respond_to do |format|
format.json { render json: labels }