diff options
| author | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:07 +0000 |
|---|---|---|
| committer | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:07 +0000 |
| commit | b5e8de5c4c202d10ef8b48248b12f49c1330d04a (patch) | |
| tree | e034bee79723e84eab1e9257c3848d4c991d5333 /app/models/label.rb | |
| parent | 8f44bc4dc10caf3c9856a8e4bea5ac145a315131 (diff) | |
| parent | 3605e4307ddf373071c0353a066c50fcead01e45 (diff) | |
| download | gitlab-ce-b5e8de5c4c202d10ef8b48248b12f49c1330d04a.tar.gz | |
Merge branch 'master' into '24196-protected-variables'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/models/label.rb')
| -rw-r--r-- | app/models/label.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/label.rb b/app/models/label.rb index ddddb6bdf8f..074239702f8 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -133,6 +133,10 @@ class Label < ActiveRecord::Base template end + def color + super || DEFAULT_COLOR + end + def text_color LabelsHelper.text_color_for_bg(self.color) end |