Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.

2 files changed, 14 insertions, 1 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e5e64650708..e87d8dc21cc 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -181,7 +181,7 @@ module ApplicationHelper
   end
 
   def edited_time_ago_with_tooltip(object, placement: 'top', html_class: 'time_ago', exclude_author: false)
-    return if object.last_edited_at == object.created_at || object.last_edited_at.blank?
+    return unless object.is_edited?
 
     content_tag :small, class: 'edited-text' do
       output = content_tag(:span, 'Edited ')
diff --git a/app/helpers/editable_helper.rb b/app/helpers/editable_helper.rb
new file mode 100644
index 00000000000..e3ad62e8c18
--- /dev/null
+++ b/app/helpers/editable_helper.rb
@@ -0,0 +1,13 @@
+module EditableHelper
+  def updated_at_by(editable)
+    return nil unless editable.is_edited?
+
+    {
+      updated_at: editable.updated_at,
+      updated_by: {
+        name: editable.last_edited_by.name,
+        path: user_path(editable.last_edited_by)
+      }
+    }
+  end
+end