diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-10 18:10:20 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-10 18:10:20 +0000 |
| commit | e3911a1896d8725f7b739929b7de1ab09917eed5 (patch) | |
| tree | 01bc6b8d378a53612c36768ee75ac0166f27d171 /app/controllers | |
| parent | 48c80fdf43e44ae003753c81a832fc2c0eafdb5d (diff) | |
| parent | faaab2aef8e7f6b06f8f04dc68596e1229d507db (diff) | |
| download | gitlab-ce-e3911a1896d8725f7b739929b7de1ab09917eed5.tar.gz | |
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
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/dashboard/labels_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/dashboard/labels_controller.rb b/app/controllers/dashboard/labels_controller.rb index 23a4ef21ea2..2a88350a4ca 100644 --- a/app/controllers/dashboard/labels_controller.rb +++ b/app/controllers/dashboard/labels_controller.rb @@ -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 } |