gitlab-org--gitlab-foss/app/views/projects/notes/_discussion.html.haml

- note = discussion_notes.first
.timeline-entry
  .timeline-entry-inner
    .timeline-icon
      = link_to user_path(note.author) do
        = image_tag avatar_icon(note.author_email), class: "avatar s40"
    .timeline-content
      - if note.for_merge_request?
        - (active_notes, outdated_notes) = discussion_notes.partition(&:active?)
        = render "projects/notes/discussions/active", discussion_notes: active_notes if active_notes.length > 0
        = render "projects/notes/discussions/outdated", discussion_notes: outdated_notes if outdated_notes.length > 0
      - else
        = render "projects/notes/discussions/commit", discussion_notes: discussion_notes
Update notes views to support discussions 2012-12-02 14:53:50 -05:00			`- note = discussion_notes.first`
Fix UI bugs with discussions Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-09-09 05:36:55 -04:00			`.timeline-entry`
Fix discussion style for timeline Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-08-15 09:29:25 -04:00			`.timeline-entry-inner`
			`.timeline-icon`
Link note avatar to user. 2015-03-24 13:16:40 -04:00			`= link_to user_path(note.author) do`
			`= image_tag avatar_icon(note.author_email), class: "avatar s40"`
Fix discussion style for timeline Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-08-15 09:29:25 -04:00			`.timeline-content`
			`- if note.for_merge_request?`
Fix merge request comments on files with multiple commits Having a merge request with a comments on a line which is then changed in a later commit prevented new comments from properly showing up in the merge request show page. * `Note#set_diff` do not use stored the diff when creating a new note in merge requests (we can not be sure the diff did not changed since the last comment on that line) * Do not rely just on `outdated?` of the first note when displaying comments of a MR in the discussion tab, but partition the active/outdated notes and display them all * In the inline changes tab just select the active notes, so an outdated note does not prevent an active one from being rendered * Just show active comments in the side-by-side changes tab 2015-04-03 10:46:23 -04:00			`- (active_notes, outdated_notes) = discussion_notes.partition(&:active?)`
			`= render "projects/notes/discussions/active", discussion_notes: active_notes if active_notes.length > 0`
			`= render "projects/notes/discussions/outdated", discussion_notes: outdated_notes if outdated_notes.length > 0`
Fix discussion style for timeline Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-08-15 09:29:25 -04:00			`- else`
			`= render "projects/notes/discussions/commit", discussion_notes: discussion_notes`