08edfb67b1
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32087 Easy reproduction: 1. Edit an issue title 1. Notice the system note added 1. Switch to another tab and back (to fire the polling immediately) 1. Notice the flicker (without this fix)
65 lines
2.8 KiB
Text
65 lines
2.8 KiB
Text
- return unless note.author
|
|
- return if note.cross_reference_not_visible_for?(current_user)
|
|
|
|
- note_editable = note_editable?(note)
|
|
%li.timeline-entry{ id: dom_id(note),
|
|
class: ["note", "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
|
|
= icon_for_system_note(note)
|
|
- else
|
|
%a{ href: user_path(note.author) }
|
|
= image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
|
|
.timeline-content
|
|
.note-header
|
|
.note-header-info
|
|
%a{ href: user_path(note.author) }
|
|
%span.hidden-xs
|
|
= sanitize(note.author.name)
|
|
%span.note-headline-light
|
|
= note.author.to_reference
|
|
%span.note-headline-light
|
|
%span.note-headline-meta
|
|
- unless note.system
|
|
commented
|
|
- if note.system
|
|
%span.system-note-message
|
|
= note.redacted_note_html
|
|
.original-note-content.hidden
|
|
= note.note
|
|
%a{ href: "##{dom_id(note)}" }
|
|
= time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
|
|
- unless note.system?
|
|
.note-actions
|
|
- if note.for_personal_snippet?
|
|
= render 'snippets/notes/actions', note: note, note_editable: note_editable
|
|
- else
|
|
= render 'projects/notes/actions', note: note, note_editable: note_editable
|
|
.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')
|
|
- if note_editable
|
|
= render 'shared/notes/edit', note: note
|
|
.note-awards
|
|
= render 'award_emoji/awards_block', awardable: note, inline: false
|
|
- if note.system
|
|
.system-note-commit-list-toggler
|
|
Toggle commit list
|
|
%i.fa.fa-angle-down
|
|
- if note.attachment.url
|
|
.note-attachment
|
|
- if note.attachment.image?
|
|
= link_to note.attachment.url, target: '_blank' do
|
|
= image_tag note.attachment.url, class: 'note-image-attach'
|
|
.attachment
|
|
= link_to note.attachment.url, target: '_blank' do
|
|
= icon('paperclip')
|
|
= note.attachment_identifier
|
|
= link_to delete_attachment_namespace_project_note_path(note.project.namespace, note.project, note),
|
|
title: 'Delete this attachment', method: :delete, remote: true, data: { confirm: 'Are you sure you want to remove the attachment?' }, class: 'danger js-note-attachment-delete' do
|
|
= icon('trash-o', class: 'cred')
|