diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-29 16:47:57 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-31 12:58:20 +0100 |
| commit | 0c3cef02b31f1f6818ed68b33e31db49e72ee260 (patch) | |
| tree | 47ad909e7ad854aea03449e00680494f3698610c | |
| parent | e0960e2877a0f01d2fbc07d342d06123790132bc (diff) | |
| download | gitlab-ce-0c3cef02b31f1f6818ed68b33e31db49e72ee260.tar.gz | |
Standardised the discussion headers
| -rw-r--r-- | app/views/projects/notes/discussions/_commit.html.haml | 10 | ||||
| -rw-r--r-- | app/views/projects/notes/discussions/_outdated.html.haml | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app/views/projects/notes/discussions/_commit.html.haml b/app/views/projects/notes/discussions/_commit.html.haml index e9913c8c62b..46f2ba4bbcf 100644 --- a/app/views/projects/notes/discussions/_commit.html.haml +++ b/app/views/projects/notes/discussions/_commit.html.haml @@ -3,15 +3,15 @@ - commit_description = commit ? 'commit' : 'a deleted commit' .discussion.js-toggle-container{ class: note.discussion_id } .discussion-header + = link_to_member(@project, note.author, avatar: false) + .inline.discussion-headline-light + = "#{note.author.to_reference} started a discussion on #{commit_description}" + - if commit + = link_to(commit.short_id, namespace_project_commit_path(note.project.namespace, note.project, note.noteable), class: 'monospace') .discussion-actions = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do %i.fa.fa-chevron-up Show/hide discussion - %div - = link_to_member(@project, note.author, avatar: false) - started a discussion on #{commit_description} - - if commit - = link_to(commit.short_id, namespace_project_commit_path(note.project.namespace, note.project, note.noteable), class: 'monospace') .last-update.hide.js-toggle-content - last_note = discussion_notes.last last updated by diff --git a/app/views/projects/notes/discussions/_outdated.html.haml b/app/views/projects/notes/discussions/_outdated.html.haml index 28019041967..f8e000b424f 100644 --- a/app/views/projects/notes/discussions/_outdated.html.haml +++ b/app/views/projects/notes/discussions/_outdated.html.haml @@ -1,15 +1,15 @@ - note = discussion_notes.first .discussion.js-toggle-container{ class: note.discussion_id } .discussion-header + = link_to_member(@project, note.author, avatar: false) + .inline.discussion-headline-light + = "#{note.author.to_reference} started a discussion" + on the outdated diff .discussion-actions = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do %i.fa.fa-chevron-down Show/hide discussion - %div - = link_to_member(@project, note.author, avatar: false) - started a discussion on the - outdated diff - %div + .last-update.hide.js-toggle-content - last_note = discussion_notes.last last updated by = link_to_member(@project, last_note.author, avatar: false) |