Commit e3911a18 authored by Jacob Schatz's avatar Jacob Schatz

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
parents 48c80fdf faaab2ae
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 }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment