Commit 9a3cab6b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
parent e93f6b03
...@@ -6,42 +6,3 @@ ...@@ -6,42 +6,3 @@
= render "projects/notes/discussions/active", discussion_notes: discussion_notes = render "projects/notes/discussions/active", discussion_notes: discussion_notes
- else - else
= render "projects/notes/discussions/commit", discussion_notes: discussion_notes = render "projects/notes/discussions/commit", discussion_notes: discussion_notes
-#.discussion.js-toggle-container{ class: note.discussion_id }
.discussion-header
.discussion-actions
= link_to "#", class: "js-toggle-button" do
%i.icon-chevron-up
Show/hide discussion
= image_tag avatar_icon(note.author_email), class: "avatar s32"
%div
= link_to_member(@project, note.author, avatar: false)
- if note.for_merge_request?
- if note.diff
started a discussion on the diff
= link_to_merge_request_diff_line_note(note)
- else
started
%strong
%i.icon-remove
outdated
discussion on this merge request diff
- elsif note.for_commit?
started a discussion on commit
#{link_to note.noteable.short_id, project_commit_path(note.project, note.noteable)}
= link_to_commit_diff_line_note(note) if note.for_diff_line?
- else
%cite.cgray started a discussion
%div
- last_note = discussion_notes.last
last updated by
= link_to_member(@project, last_note.author, avatar: false)
%span.discussion-last-update
#{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')}
.discussion-body.js-toggle-content
- if note.for_diff_line?
= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
- else
.notes{ rel: discussion_notes.first.discussion_id }
= render discussion_notes
= link_to_reply_diff(discussion_notes.first)
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