diff options
author | Rémy Coutable <remy@rymai.me> | 2019-01-22 14:34:52 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-01-22 14:34:52 +0000 |
commit | 1bbeb42d695828fe0aaff4345c9d513d7f753321 (patch) | |
tree | 7b912061b38a69882a3bd2df6da26a3f9cbbb726 | |
parent | 3383babcbcb8e668d8cfe9ab0d397149f27bf23e (diff) | |
parent | 51359a1fb8976292b4735715e5cb4cbf664ab34b (diff) | |
download | gitlab-ce-1bbeb42d695828fe0aaff4345c9d513d7f753321.tar.gz |
Merge branch '53714-inconsistent-text-color-for-labels' into 'master'
Resolve "Inconsistent text color for labels"
Closes #53714
See merge request gitlab-org/gitlab-ce!23873
-rw-r--r-- | app/models/label.rb | 1 | ||||
-rw-r--r-- | changelogs/unreleased/53714-inconsistent-text-color-for-labels.yml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/models/label.rb b/app/models/label.rb index 5d2d1afd1d9..1c3db3eb35d 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -214,6 +214,7 @@ class Label < ActiveRecord::Base super(options).tap do |json| json[:type] = self.try(:type) json[:priority] = priority(options[:project]) if options.key?(:project) + json[:textColor] = text_color end end diff --git a/changelogs/unreleased/53714-inconsistent-text-color-for-labels.yml b/changelogs/unreleased/53714-inconsistent-text-color-for-labels.yml new file mode 100644 index 00000000000..d804e2df2cd --- /dev/null +++ b/changelogs/unreleased/53714-inconsistent-text-color-for-labels.yml @@ -0,0 +1,5 @@ +--- +title: Fix foreground color for labels to ensure consistency of label appearance +merge_request: 23873 +author: Nathan Friend +type: fixed |