diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-10 09:08:30 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-10 09:08:30 +0000 |
commit | f96c34ec456deca5bb93ef27e578f078ece24aa3 (patch) | |
tree | 7b1020a159760135187b43cfc5444b5f4089b79c /app/models/label.rb | |
parent | 3dc64764ad4c004f1b72aa4e80f0095e7a9a6571 (diff) | |
parent | 22db5e14f2158665bbeb24921678bb71de2014f3 (diff) | |
download | gitlab-ce-f96c34ec456deca5bb93ef27e578f078ece24aa3.tar.gz |
Merge branch 'remove-annotate-gem' into 'master'
Remove the annotate gem and delete old annotations
In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation
has changes, which was causing a lot of noise in diffs. We decided in #17382
that it is better to get rid of the whole annotate gem, and instead let people
look at schema.rb for the columns in a table.
Fixes: #17382
/cc @yorickpeterse
See merge request !4099
Diffstat (limited to 'app/models/label.rb')
-rw-r--r-- | app/models/label.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/app/models/label.rb b/app/models/label.rb index 8a24a6e69b3..e5ad11983be 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -1,17 +1,3 @@ -# == Schema Information -# -# Table name: labels -# -# id :integer not null, primary key -# title :string -# color :string -# project_id :integer -# created_at :datetime -# updated_at :datetime -# template :boolean default(FALSE) -# description :string -# - class Label < ActiveRecord::Base include Referable include Subscribable |