diff options
| author | Phil Hughes <me@iamphill.com> | 2016-08-19 14:45:19 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-08-19 14:45:19 +0100 |
| commit | d6a14e99104b63f263bf962e1855145656198694 (patch) | |
| tree | 06d3eb3fab9ae677fa829c4a1839d9232df6a5ba | |
| parent | 12fe6a6fd733110acc72aa0f5bdaec2b1fa1f358 (diff) | |
| download | gitlab-ce-d6a14e99104b63f263bf962e1855145656198694.tar.gz | |
Added text color to issues labels in issue board lists
| -rw-r--r-- | app/assets/javascripts/boards/models/label.js.es6 | 1 | ||||
| -rw-r--r-- | app/controllers/projects/boards/issues_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/models/label.js.es6 b/app/assets/javascripts/boards/models/label.js.es6 index e81e91fe972..583829552cd 100644 --- a/app/assets/javascripts/boards/models/label.js.es6 +++ b/app/assets/javascripts/boards/models/label.js.es6 @@ -3,6 +3,7 @@ class ListLabel { this.id = obj.id; this.title = obj.title; this.color = obj.color; + this.textColor = obj.text_color; this.description = obj.description; this.priority = (obj.priority !== null) ? obj.priority : Infinity; } 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 |