Merge remote-tracking branch 'upstream/pull/5751'

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

diff --git a/app/models/note.rb b/app/models/note.rb
index 2ec72a03ac6fd5bf228d3319546fd6700e140995..068efa59a3c35c39c920e1d92882822963bde444 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -92,22 +92,9 @@ class Note < ApplicationRecord
     closed_at + DEFAULT_FRESHLY_CLOSED_LIMIT
   end
 
     closed_at + DEFAULT_FRESHLY_CLOSED_LIMIT
   end
 

-  # Return the note's description, derived from the first comment
+  # Return the note's description

   def description
   def description

-    if user_ip.nil? && user_id.nil?
-      all_comments.first.body if all_comments.first&.event == "opened"
-    else
-      RichText.new("text", super)
-    end
-  end
-
-  # Return the note's author object, derived from the first comment
-  def author
-    if user_ip.nil? && user_id.nil?
-      all_comments.first.author if all_comments.first&.event == "opened"
-    else
-      super
-    end
+    RichText.new("text", super)

   end
 
   private
   end
 
   private