summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-16 18:37:25 +0000
committerPhil Hughes <me@iamphill.com>2016-03-16 18:37:25 +0000
commit581cccbc64a556c8096982f2479a83746a799bc1 (patch)
tree2a6ed5166f056e876f171b823e2b50b5837e8139
parente5ead2571ea356cc0c2a42ae4ebc519d8560cb8d (diff)
downloadgitlab-ce-labels-dropdown-endpoint.tar.gz
Full labels data in JSONlabels-dropdown-endpoint
-rw-r--r--app/controllers/projects/labels_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index c61793f89af..5f471d405f5 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -16,7 +16,7 @@ class Projects::LabelsController < Projects::ApplicationController
respond_to do |format|
format.html
format.json do
- render json: @labels.to_json
+ render json: @project.labels
end
end
end