diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-05-05 22:00:36 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-05-05 22:00:36 +0100 |
| commit | 86e75ae09238c7f73347c0e310c47f6070c005b9 (patch) | |
| tree | e2ce5edb596eb8b35cf530669f34bf1cb034b05a /app/views | |
| parent | c1d5af67d3743b12718939c9d60c38035d388176 (diff) | |
| parent | 8c4c40d09b6947f4ac652dd76cc422fea2a6443d (diff) | |
| download | gitlab-ce-86e75ae09238c7f73347c0e310c47f6070c005b9.tar.gz | |
Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/notes/_note.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/snippets/_header.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml index 071c48fa2e4..5c1156b06fb 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 = render 'shared/notes/edit', note: note .note-awards 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) |