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
This commit is contained in:
Jacob Schatz 2016-05-10 18:10:20 +00:00
commit e3911a1896
1 changed files with 1 additions and 1 deletions

View File

@ -1,6 +1,6 @@
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 }