Merge branch 'discussion-notes' into 'master'

Discussion notes update - At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues - Moved the dates to be in the header like other notes - Fixed overlapping issue on mobile See merge request !3720

Merge branch 'discussion-notes' into 'master'
4d5d6194 · Jacob Schatz · 06952aaf · 038e6230 · 4d5d6194 · 4d5d6194
Commit 4d5d6194 authored Apr 18, 2016 by Jacob Schatz
6 changed files
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -39,8 +39,7 @@
  .diff-file {
    border: 1px solid $border-color;
    border-bottom: none;
-    margin-left: 0;
-    margin-right: 0;
+    margin: 0;
  }
 }


--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -198,6 +198,12 @@ ul.notes {
  color: $notes-light-color;
 }

+.discussion-headline-light {
+  a {
+    color: $gl-link-color;
+  }
+}
+
 /**
 * Actions for Discussions/Notes
 */
@@ -209,6 +215,17 @@ ul.notes {
  color: $notes-action-color;
 }

+.discussion-actions {
+  @media (max-width: $screen-sm-max) {
+    float: none;
+    margin-left: 0;
+
+    .note-action-button {
+      margin-left: 0;
+    }
+  }
+}
+
 .note-action-button,
 .discussion-action-button {
  display: inline-block;

--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
 - note = discussion_notes.first
-.timeline-entry
+%li.note.note-discussion.timeline-entry
  .timeline-entry-inner
    .timeline-icon
      = link_to user_path(note.author) do

--- a/app/views/projects/notes/discussions/_active.html.haml
+++ b/app/views/projects/notes/discussions/_active.html.haml
@@ -6,15 +6,11 @@
      = "#{note.author.to_reference} started a discussion"
      = link_to diffs_namespace_project_merge_request_path(note.project.namespace, note.project, note.noteable, anchor: note.line_code) do
        on the diff
+      = time_ago_with_tooltip(note.created_at, placement: "bottom", html_class: "discussion_updated_ago")
    .discussion-actions
      = link_to "#", class: "discussion-action-button discussion-toggle-button js-toggle-button" do
        %i.fa.fa-chevron-up
        Show/hide discussion
-    .last-update.hide.js-toggle-content
-      - last_note = discussion_notes.last
-      last updated by
-      = link_to_member(@project, last_note.author, avatar: false)
-      #{time_ago_with_tooltip(last_note.updated_at, placement: 'bottom', html_class: 'discussion_updated_ago')}

  .discussion-body.js-toggle-content
    = render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note
--- a/app/views/projects/notes/discussions/_commit.html.haml
+++ b/app/views/projects/notes/discussions/_commit.html.haml
@@ -8,21 +8,18 @@
      = "#{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')
+      = time_ago_with_tooltip(note.created_at, placement: "bottom", html_class: "discussion_updated_ago")
    .discussion-actions
      = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
        %i.fa.fa-chevron-up
        Show/hide discussion
-    .last-update.hide.js-toggle-content
-      - last_note = discussion_notes.last
-      last updated by
-      = link_to_member(@project, last_note.author, avatar: false)
-      #{time_ago_with_tooltip(last_note.updated_at, placement: 'bottom', html_class: 'discussion_updated_ago')}
  .discussion-body.js-toggle-content
    - if note.for_diff_line?
      = render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note
    - else
      .panel.panel-default
        .notes{ data: { discussion_id: discussion_notes.first.discussion_id } }
-          = render discussion_notes
+          %ul.notes.timeline
+            = render discussion_notes
        .discussion-reply-holder
          = link_to_reply_diff(discussion_notes.first)
--- a/app/views/projects/notes/discussions/_outdated.html.haml
+++ b/app/views/projects/notes/discussions/_outdated.html.haml
@@ -5,14 +5,10 @@
    .inline.discussion-headline-light
      = "#{note.author.to_reference} started a discussion"
      on the outdated diff
+      = time_ago_with_tooltip(note.created_at, placement: "bottom", html_class: "discussion_updated_ago")
    .discussion-actions
      = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do
        %i.fa.fa-chevron-down
        Show/hide discussion
-    .last-update.hide.js-toggle-content
-      - last_note = discussion_notes.last
-      last updated by
-      = link_to_member(@project, last_note.author, avatar: false)
-      #{time_ago_with_tooltip(last_note.updated_at, placement: 'bottom', html_class: 'discussion_updated_ago')}
  .discussion-body.js-toggle-content.hide
    = render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note