diff options
author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-05-03 22:46:10 +1100 |
---|---|---|
committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-05-04 13:07:03 +1100 |
commit | ac99441de9774333da4422eb9072777c09a2ad7a (patch) | |
tree | 4d30badaca5da71e4a196b3a494fd468ebf0ef2f | |
parent | aaa70a62b05f846a677a4b4dc5ccc83ca82fba32 (diff) | |
download | gitlab-ce-ac99441de9774333da4422eb9072777c09a2ad7a.tar.gz |
Change 'exclude_author' param
-rw-r--r-- | app/helpers/application_helper.rb | 4 | ||||
-rw-r--r-- | app/views/projects/issues/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/notes/_note.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/snippets/_header.html.haml | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0ff6ab48808..6d6bcbaf88a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -180,14 +180,14 @@ module ApplicationHelper element end - def edited_time_ago_with_tooltip(object, placement: 'top', html_class: 'time_ago', include_author: false) + 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? content_tag :small, class: 'edited-text' do output = content_tag(:span, 'Edited ') output << time_ago_with_tooltip(object.last_edited_at, placement: placement, html_class: html_class) - if include_author && object.last_edited_by + if !exclude_author && object.last_edited_by output << content_tag(:span, ' by ') output << link_to_member(object.project, object.last_edited_by, avatar: false, author_class: nil) end diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 9bddc3ac44d..2a871966aa8 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -61,7 +61,7 @@ = markdown_field(@issue, :description) %textarea.hidden.js-task-list-field = @issue.description - = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue_edited_ago', include_author: true) + = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue_edited_ago') #merge-requests{ data: { url: referenced_merge_requests_namespace_project_issue_url(@project.namespace, @project, @issue) } } // This element is filled in using JavaScript. diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index 3b2cbb12a85..8a390cf8700 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -10,4 +10,4 @@ %textarea.hidden.js-task-list-field = @merge_request.description - = edited_time_ago_with_tooltip(@merge_request, placement: 'bottom', include_author: true) + = edited_time_ago_with_tooltip(@merge_request, placement: 'bottom') diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml index 9657b4eea82..6868f63199a 100644 --- a/app/views/shared/notes/_note.html.haml +++ b/app/views/shared/notes/_note.html.haml @@ -40,7 +40,7 @@ .note-body{ class: note_editable ? 'js-task-list-container' : '' } .note-text.md = note.redacted_note_html - = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago', include_author: true) + = edited_time_ago_with_tooltip(note, placement: 'bottom', html_class: 'note_edited_ago') - if note_editable - if note.for_personal_snippet? = render 'snippets/notes/edit', note: note diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml index d084f5e9684..501c09d71d5 100644 --- a/app/views/shared/snippets/_header.html.haml +++ b/app/views/shared/snippets/_header.html.haml @@ -21,4 +21,4 @@ = markdown_field(@snippet, :title) - if @snippet.updated_at != @snippet.created_at - = edited_time_ago_with_tooltip(@snippet, placement: 'bottom', html_class: 'snippet-edited-ago') + = edited_time_ago_with_tooltip(@snippet, placement: 'bottom', html_class: 'snippet-edited-ago', exclude_author: true) |