summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-03-07 08:32:10 +0000
committerDouwe Maan <douwe@gitlab.com>2016-03-07 08:32:10 +0000
commit20ed08ed8f4edee3845801e71c7b4c3f1d0132a2 (patch)
tree43a38aa483de700396dd4130d2fc41488579dec2
parentb8a1f1c42d886359d139f737d78bf5ecf8f4286a (diff)
parent1b27c3c5f85c85c13c2d241f05e0ab5ccf3de943 (diff)
downloadgitlab-ce-20ed08ed8f4edee3845801e71c7b4c3f1d0132a2.tar.gz
Merge branch 'rs-note-model-cleanup' into 'master'
Minor Note model cleanup Remove `Note#noteable_type_name` This method was added in Dec 2012, its single use was removed two days later, and it's been there ever since. --- Remove `Note#system?` "override" This method was duplicating default Rails behavior. See merge request !3104
-rw-r--r--app/models/note.rb8
1 files changed, 0 insertions, 8 deletions
diff --git a/app/models/note.rb b/app/models/note.rb
index 1a7b2ba6d42..da07340f4a1 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -323,10 +323,6 @@ class Note < ActiveRecord::Base
noteable
end
- def noteable_type_name
- noteable_type.downcase if noteable_type.present?
- end
-
# FIXME: Hack for polymorphic associations with STI
# For more information visit http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#label-Polymorphic+Associations
def noteable_type=(noteable_type)
@@ -346,10 +342,6 @@ class Note < ActiveRecord::Base
Event.reset_event_cache_for(self)
end
- def system?
- read_attribute(:system)
- end
-
def downvote?
is_award && note == "thumbsdown"
end