Merge branch 'master' into notes

[rails.git] / app / models / note_comment.rb

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index 0500acb8bf2b11ffb12eda1c54bac03210ef5143..39902911879abffbd0d455f91bcd2b524ac24f52 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -10,15 +10,6 @@ class NoteComment < ActiveRecord::Base
   validates_associated :author
   validates_inclusion_of :event, :in => [ "opened", "closed", "reopened", "commented", "hidden" ]
 
-  # Return the author name
-  def author_name
-    if self.author_id.nil?
-      self.read_attribute(:author_name)
-    else
-      self.author.display_name
-    end
-  end
-
   # Return the comment text
   def body
     RichText.new("text", read_attribute(:body))