From 9a3cab6bf63928c32f60997aa5bdc665e26c4ce0 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 24 Jun 2014 22:23:32 +0300 Subject: [PATCH] Cleanup Signed-off-by: Dmitriy Zaporozhets --- .../projects/notes/_discussion.html.haml | 39 ------------------- .../notes/_outdated_discussion.html.haml | 0 2 files changed, 39 deletions(-) delete mode 100644 app/views/projects/notes/_outdated_discussion.html.haml diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml index 73f1fe788ea..8c7964cbf3e 100644 --- a/app/views/projects/notes/_discussion.html.haml +++ b/app/views/projects/notes/_discussion.html.haml @@ -6,42 +6,3 @@ = render "projects/notes/discussions/active", discussion_notes: discussion_notes - else = 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) diff --git a/app/views/projects/notes/_outdated_discussion.html.haml b/app/views/projects/notes/_outdated_discussion.html.haml deleted file mode 100644 index e69de29bb2d..00000000000