summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-05-16 16:59:48 +0000
committerRobert Speicher <robert@gitlab.com>2018-05-16 16:59:48 +0000
commitd98364fa33fff8b4a571563e5f17329ffdba8a17 (patch)
tree3fda27102953bdb0dd350c7c52f59f68c9677e1e /app/models
parent50d687f626ed18e158613a14c4338c01c6e71b85 (diff)
parente2e72fe5680e65bfed4d5fff5def829ff7ef9aeb (diff)
downloadgitlab-ce-d98364fa33fff8b4a571563e5f17329ffdba8a17.tar.gz
Merge branch 'osw-fix-boards-list-header-color' into 'master'
Adjust board lists header text color Closes #36983 See merge request gitlab-org/gitlab-ce!18955
Diffstat (limited to 'app/models')
-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