Merge branch 'issue_15673' into 'master'

Add to label ID to response Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15673 See merge request !4023

Merge branch 'issue_15673' into 'master'
e3911a18 · Jacob Schatz · 48c80fdf · faaab2ae · e3911a18
Commit e3911a18 authored May 10, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

labels_controller.rb app/controllers/dashboard/labels_controller.rb +1 -1

No files found.
--- a/app/controllers/dashboard/labels_controller.rb
+++ b/app/controllers/dashboard/labels_controller.rb
 class Dashboard::LabelsController < Dashboard::ApplicationController
  def index
-    labels = Label.where(project_id: projects).select(:title, :color).uniq(:title)
+    labels = Label.where(project_id: projects).select(:id, :title, :color).uniq(:title)

    respond_to do |format|
      format.json { render json: labels }