diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 09:40:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 09:40:42 +0000 |
| commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
| tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/views/shared/notes/_note.html.haml | |
| parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) | |
| download | gitlab-ce-ee664acb356f8123f4f6b00b73c1e1cf0866c7fb.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/views/shared/notes/_note.html.haml')
| -rw-r--r-- | app/views/shared/notes/_note.html.haml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml index 3ab8514aebf..c552e94ac57 100644 --- a/app/views/shared/notes/_note.html.haml +++ b/app/views/shared/notes/_note.html.haml @@ -6,17 +6,18 @@ - note_counter = local_assigns.fetch(:note_counter, 0) %li.timeline-entry.note-wrapper{ id: dom_id(note), - class: ["note", "note-row-#{note.id}", ('system-note' if note.system)], + class: ["note", "note-comment", "note-row-#{note.id}", ('system-note' if note.system)], data: { author_id: note.author.id, editable: note_editable, note_id: note.id } } .timeline-entry-inner - .timeline-icon - - if note.system + - if note.system + .timeline-icon = icon_for_system_note(note) - - else + - else + .timeline-avatar.gl-float-left %a.image-diff-avatar-link{ href: user_path(note.author) } - = image_tag avatar_icon_for_user(note.author), alt: '', class: 'avatar s40' + = render Pajamas::AvatarComponent.new(note.author, size: 32, alt: '') - if note.is_a?(DiffNote) && note.on_image? - if show_image_comment_badge && note_counter == 0 -# Only show this for the first comment in the discussion @@ -34,9 +35,9 @@ %span.note-header-author-name.bold = note.author.name = user_status(note.author) - %span.note-headline-light{ data: { qa_selector: 'note_author_content' } } + %spannote-headline-light{ data: { qa_selector: 'note_author_content' } } = note.author.to_reference - %span.note-headline-light.note-headline-meta + %span.note-headline-ligh.note-headline-meta - if note.system %span.system-note-message = markdown_field(note, :note) |