Merge branch 'rs-note-delegates-mentionable'

# Conflicts:
#	app/models/note.rb

1 files changed, 1 insertions, 10 deletions

diff --git a/app/models/note.rb b/app/models/note.rb
index 7662f7b5c17..3b20d5d22b6 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -39,6 +39,7 @@ class Note < ActiveRecord::Base
 
   has_many :todos, dependent: :destroy
 
+  delegate :gfm_reference, :local_reference, to: :noteable
   delegate :name, to: :project, prefix: true
   delegate :name, :email, to: :author, prefix: true
 
@@ -313,16 +314,6 @@ class Note < ActiveRecord::Base
     nil
   end
 
-  # Mentionable override.
-  def gfm_reference(from_project = nil)
-    noteable.gfm_reference(from_project)
-  end
-
-  # Mentionable override.
-  def local_reference
-    noteable
-  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)