Commit 05c198e9 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'misalinged-discussion-with-no-avatar-26854' into 'master'

adds avatar for discussion note

Closes #26854

See merge request !8734
parents 70d29ad8 e773f563
- expanded = discussion.expanded? - expanded = discussion.expanded?
%li.note.note-discussion.timeline-entry %li.note.note-discussion.timeline-entry
.timeline-entry-inner .timeline-entry-inner
.timeline-icon
= link_to user_path(discussion.author) do
= image_tag avatar_icon(discussion.author), class: "avatar s40"
.timeline-content .timeline-content
.discussion.js-toggle-container{ class: discussion.id, data: { discussion_id: discussion.id } } .discussion.js-toggle-container{ class: discussion.id, data: { discussion_id: discussion.id } }
.discussion-header .discussion-header
......
---
title: adds avatar for discussion note
merge_request: 8734
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment