diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-21 08:50:15 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-21 08:50:15 +0100 |
| commit | 7f23e0b8c051da34c8587e4096476939a57fee24 (patch) | |
| tree | c9d1d8515bd03c5cdb6092aeb9af402637a1041e /app/controllers | |
| parent | b4ed6efd50face25fa52693415616d5f3c7964e2 (diff) | |
| download | gitlab-ce-7f23e0b8c051da34c8587e4096476939a57fee24.tar.gz | |
Fixes text color on labels in sidebar
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index e86428147ef..346b0556159 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -110,7 +110,7 @@ class Projects::IssuesController < Projects::ApplicationController end end format.json do - render json: @issue.to_json(include: [:milestone, :labels, assignee: { methods: :avatar_url }]) + render json: @issue.to_json(include: [:milestone, labels: { methods: :text_color }, assignee: { methods: :avatar_url }]) end end end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 1388ea9d66c..d82a4290ed9 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -155,7 +155,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_request.target_project, @merge_request]) end format.json do - render json: @merge_request.to_json(include: [:milestone, :labels, assignee: { methods: :avatar_url }]) + render json: @merge_request.to_json(include: [:milestone, labels: { methods: :text_color }, assignee: { methods: :avatar_url }]) end end else |