diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-19 18:02:55 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-19 18:02:55 +0000 |
| commit | 2e34e5f1b75673d853822cfad827f48c48ed1353 (patch) | |
| tree | ee55f7a25816c191296193cbf06d42ff3b4fc84f /app/controllers | |
| parent | daa0cc1cf7805a08dec4c305122998e36c71579e (diff) | |
| parent | 32ca5a88c8225e50760205112f6236ae651852d0 (diff) | |
| download | gitlab-ce-2e34e5f1b75673d853822cfad827f48c48ed1353.tar.gz | |
Merge branch 'issue-boards-label-text-color' into 'master'
Added text color to issues labels in issue board lists
## What does this MR do?
Adds the text color for labels in the response. The frontend was
already setup to handle this, just needed the data from the backend.
See merge request !5898
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/boards/issues_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/boards/issues_controller.rb b/app/controllers/projects/boards/issues_controller.rb index 2d894b3dd4a..1a4f6b50e8f 100644 --- a/app/controllers/projects/boards/issues_controller.rb +++ b/app/controllers/projects/boards/issues_controller.rb @@ -12,7 +12,7 @@ module Projects only: [:iid, :title, :confidential], include: { assignee: { only: [:id, :name, :username], methods: [:avatar_url] }, - labels: { only: [:id, :title, :description, :color, :priority] } + labels: { only: [:id, :title, :description, :color, :priority], methods: [:text_color] } }) end |