summaryrefslogtreecommitdiff
path: root/app/models/label.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-02-19 17:54:13 -0800
committerDouwe Maan <douwe@selenight.nl>2016-02-19 17:54:13 -0800
commit31682eb987ea6ab4f187a9e2bacb23d2ed86b1f5 (patch)
tree5a4177a685daa62164f0e0ea1902ed1a56684e5a /app/models/label.rb
parent0c5abb1e0ba87a9e8c28dfc2f1cf455cf5b64ab9 (diff)
parentcec57275f0b96fcd5644239bfbe2773cdec0ed58 (diff)
downloadgitlab-ce-31682eb987ea6ab4f187a9e2bacb23d2ed86b1f5.tar.gz
Merge branch 'visibletrap/gitlab-ce-label'
Diffstat (limited to 'app/models/label.rb')
-rw-r--r--app/models/label.rb15
1 files changed, 8 insertions, 7 deletions
diff --git a/app/models/label.rb b/app/models/label.rb
index f93ce7e1c89..07a1db4abe5 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -2,13 +2,14 @@
#
# Table name: labels
#
-# id :integer not null, primary key
-# title :string(255)
-# color :string(255)
-# project_id :integer
-# created_at :datetime
-# updated_at :datetime
-# template :boolean default(FALSE)
+# id :integer not null, primary key
+# title :string(255)
+# color :string(255)
+# project_id :integer
+# created_at :datetime
+# updated_at :datetime
+# template :boolean default(FALSE)
+# description :string(255)
#
class Label < ActiveRecord::Base