summaryrefslogtreecommitdiff
path: root/app/helpers/application_helper.rb
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2017-05-02 09:49:30 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2017-05-04 12:58:41 +1100
commitb82870afc0031cb830976fb36cd1237c6059397f (patch)
tree07e1e6cb3cbdf276d1051b6e7efeb42c9b37a256 /app/helpers/application_helper.rb
parent323596f68efe95b479a0dc29832b8033a1eddef0 (diff)
downloadgitlab-ce-b82870afc0031cb830976fb36cd1237c6059397f.tar.gz
Add author to 'Edited time ago by ...' message
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index fff57472a4f..b9d375d9b64 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -187,7 +187,7 @@ module ApplicationHelper
output = content_tag(:span, "Edited ")
output << time_ago_with_tooltip(object.updated_at, placement: placement, html_class: html_class)
- if include_author && object.updated_by && object.updated_by != object.author
+ if include_author && object.updated_by
output << content_tag(:span, " by ")
output << link_to_member(object.project, object.updated_by, avatar: false, author_class: nil)
end