summaryrefslogtreecommitdiff
path: root/app/models/label.rb
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-08-31 14:48:57 -0300
committerFelipe Artur <felipefac@gmail.com>2017-08-31 14:48:57 -0300
commit8077b728bc26e9ece8055b8301033238ddbdf3f5 (patch)
treee22b26fe9b8ca3343c2eded3c1b024704d86221c /app/models/label.rb
parentf2a43ff5b7eec188ffc470649bf40d268cbdce2a (diff)
downloadgitlab-ce-8077b728bc26e9ece8055b8301033238ddbdf3f5.tar.gz
Continue BE backport
Diffstat (limited to 'app/models/label.rb')
-rw-r--r--app/models/label.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/label.rb b/app/models/label.rb
index 7fb017f9b0c..0298e7b417c 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -173,6 +173,7 @@ class Label < ActiveRecord::Base
def as_json(options = {})
super(options).tap do |json|
+ json[:type] = self.type
json[:priority] = priority(options[:project]) if options.key?(:project)
end
end