diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-05 10:42:33 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-05 10:42:33 +0000 |
| commit | c34107608ecc5c36e80a748eb4c9b88d2b1157cf (patch) | |
| tree | b1a67e41a2b6740f2a7d6c2759a872fcdd87b23a /app/helpers/application_helper.rb | |
| parent | 65581fad5e26fdf2612c098a7fbc48a53aae5e28 (diff) | |
| parent | b2d577a7a293ac6c82a8bc64f5b134558460df5b (diff) | |
| download | gitlab-ce-c34107608ecc5c36e80a748eb4c9b88d2b1157cf.tar.gz | |
Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'
Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.
See merge request !11478
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f422c48329c..71154da7ec5 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 ') |