summaryrefslogtreecommitdiff
path: root/app/controllers/projects/labels_controller.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-16 18:08:35 +0000
committerPhil Hughes <me@iamphill.com>2016-03-18 15:18:06 +0000
commit0858cb097afcaa529e5e0fe7154af53f66ce62fe (patch)
tree0ad7db2dec770e890c7e8002860bbd7dcff127fa /app/controllers/projects/labels_controller.rb
parent9280fd4acda1da9ed2435bd83d96892d77f37e90 (diff)
downloadgitlab-ce-0858cb097afcaa529e5e0fe7154af53f66ce62fe.tar.gz
Fixed issue with labels dropdown getting wrong labels
Diffstat (limited to 'app/controllers/projects/labels_controller.rb')
-rw-r--r--app/controllers/projects/labels_controller.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index 40d8098690a..c61793f89af 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -12,6 +12,13 @@ class Projects::LabelsController < Projects::ApplicationController
def index
@labels = @project.labels.page(params[:page]).per(PER_PAGE)
+
+ respond_to do |format|
+ format.html
+ format.json do
+ render json: @labels.to_json
+ end
+ end
end
def new