summaryrefslogtreecommitdiff
path: root/app/models/list.rb
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2018-05-14 17:40:48 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2018-05-14 19:05:20 -0300
commite2e72fe5680e65bfed4d5fff5def829ff7ef9aeb (patch)
tree8a30ac37ae65662ddea9fb559995661a79dba5a3 /app/models/list.rb
parentefd7b57b3fb369b65bea477a3e3cbfa9db1449c9 (diff)
downloadgitlab-ce-e2e72fe5680e65bfed4d5fff5def829ff7ef9aeb.tar.gz
Adjust board lists header text colorosw-fix-boards-list-header-color
Adjusts regression fixed by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18786/. We were not returning the label text color correctly on the backend.
Diffstat (limited to 'app/models/list.rb')
-rw-r--r--app/models/list.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/list.rb b/app/models/list.rb
index 918275be142..5daf35ef845 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -31,7 +31,8 @@ class List < ActiveRecord::Base
if options.key?(:label)
json[:label] = label.as_json(
project: board.project,
- only: [:id, :title, :description, :color]
+ only: [:id, :title, :description, :color],
+ methods: [:text_color]
)
end
end