diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-01-24 20:56:07 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-01-24 20:56:07 +0000 |
| commit | 05c198e906c245db6a3d43bfe353aa7d777443f4 (patch) | |
| tree | 05f81ce1f9c232248caf60d0d8991d98fb6cd863 | |
| parent | 70d29ad858822f8605f39c133b06d37f05a976ac (diff) | |
| parent | e773f563afe4e7de1b5a358ee8672f9a286d7c3c (diff) | |
| download | gitlab-ce-05c198e906c245db6a3d43bfe353aa7d777443f4.tar.gz | |
Merge branch 'misalinged-discussion-with-no-avatar-26854' into 'master'
adds avatar for discussion note
Closes #26854
See merge request !8734
| -rw-r--r-- | app/views/discussions/_discussion.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/misalinged-discussion-with-no-avatar-26854.yml | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 2bce2780484..6f5d4bf2a2f 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -1,6 +1,9 @@ - expanded = discussion.expanded? %li.note.note-discussion.timeline-entry .timeline-entry-inner + .timeline-icon + = link_to user_path(discussion.author) do + = image_tag avatar_icon(discussion.author), class: "avatar s40" .timeline-content .discussion.js-toggle-container{ class: discussion.id, data: { discussion_id: discussion.id } } .discussion-header diff --git a/changelogs/unreleased/misalinged-discussion-with-no-avatar-26854.yml b/changelogs/unreleased/misalinged-discussion-with-no-avatar-26854.yml new file mode 100644 index 00000000000..f32b3aea3c8 --- /dev/null +++ b/changelogs/unreleased/misalinged-discussion-with-no-avatar-26854.yml @@ -0,0 +1,4 @@ +--- +title: adds avatar for discussion note +merge_request: 8734 +author: |