58f78d0571
adds dicussion icon and color change in system note links adds discussion icons and sticky note icon for other system notes for now fixes scss lint error adds faded commit lists hides first paragraph in commit list box css tweak for commit list system notes adds commit-list toggle functionality, css tweaks and css classnames more readable small css fix in header. makes links bold in system note renames class no-shade to hide-shade adds entry for this merge request in changelog removes commented line removes the avatar-icon from discussion header minor css tweaks to make the commit list alignment with header text uses monospaced font to make the commit list lined up with all removes icon from system note and align bullet list resolves scss lint warings adds helper function to extract system note message from first p tag adds helper functions to check commit list count and haml cleanup adds changelog entry under 8.14 adds changelog entry with changelog cli removes helper and regex and makes commit list li count using JS makes link in system note normal brakeman build failure resolved fixing rspec test based on new design for discussion shows system note in lowercase removes extra spaces from comments adds code commenting for functions adds semi-colon in some lines fixes rspec given when merge build success removes commented codes rewrite changelog yml file moves isMetaKey to common utils file fixes some indentation issues removes unnecessary variables and resolves some discussions replaces jQuery parent function with siblings fixes scss issues and variable spelling mistake uses constant rather using hardcoded number for visible li count in long commit list makes system note header all lowercase uses color variables and adjust gradient a little some minor changes for adding css classes renames functions name for readability changes changelog title minor scss newline changes makes system note less intrusive to a conversation
41 lines
1.8 KiB
Text
41 lines
1.8 KiB
Text
- expanded = discussion.expanded?
|
|
%li.note.note-discussion.timeline-entry
|
|
.timeline-entry-inner
|
|
.timeline-content
|
|
.discussion.js-toggle-container{ class: discussion.id, data: { discussion_id: discussion.id } }
|
|
.discussion-header
|
|
.discussion-actions
|
|
= link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
|
|
- if expanded
|
|
= icon("chevron-up")
|
|
- else
|
|
= icon("chevron-down")
|
|
Toggle discussion
|
|
= link_to_member(@project, discussion.author, avatar: false)
|
|
|
|
.inline.discussion-headline-light
|
|
= discussion.author.to_reference
|
|
started a discussion on
|
|
|
|
- if discussion.for_commit?
|
|
- commit = discussion.noteable
|
|
- if commit
|
|
commit
|
|
= link_to commit.short_id, namespace_project_commit_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: discussion.line_code), class: 'monospace'
|
|
- else
|
|
a deleted commit
|
|
- else
|
|
- if discussion.active?
|
|
= link_to diffs_namespace_project_merge_request_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: discussion.line_code) do
|
|
the diff
|
|
- else
|
|
an outdated diff
|
|
|
|
= time_ago_with_tooltip(discussion.created_at, placement: "bottom", html_class: "note-created-ago")
|
|
|
|
.discussion-body.js-toggle-content{ class: ("hide" unless expanded) }
|
|
- if discussion.diff_discussion? && discussion.diff_file
|
|
= render "discussions/diff_with_notes", discussion: discussion
|
|
- else
|
|
.panel.panel-default
|
|
= render "discussions/notes", discussion: discussion
|