Add option to start a new discussion on an MR

3 files changed, 23 insertions, 21 deletions

diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml
index 2d78c55211e..38112f67881 100644
--- a/app/views/discussions/_discussion.html.haml
+++ b/app/views/discussions/_discussion.html.haml
@@ -18,19 +18,21 @@
 
           .inline.discussion-headline-light
             = discussion.author.to_reference
-            started a discussion on
+            started a discussion
 
-            - if discussion.for_commit?
+            - if discussion.for_commit? && @noteable != discussion.noteable
+              on
               - 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'
+                - anchor = discussion.line_code if discussion.diff_discussion?
+                = link_to commit.short_id, namespace_project_commit_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: anchor), class: 'monospace'
               - else
                 a deleted commit
-            - else
+            - elsif discussion.diff_discussion?
+              on
               - 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
+                = link_to 'the diff', discussion_diff_path(discussion)
               - else
                 an outdated diff
 
diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml
index 2789391819c..c8fcc37d1ab 100644
--- a/app/views/discussions/_notes.html.haml
+++ b/app/views/discussions/_notes.html.haml
@@ -1,18 +1,19 @@
-%ul.notes{ data: { discussion_id: discussion.id } }
+%ul.notes{ data: { discussion_id: discussion.id, original_discussion_id: discussion.original_id } }
   = render partial: "projects/notes/note", collection: discussion.notes, as: :note
 
 - if current_user
   .discussion-reply-holder
-    - if discussion.diff_discussion?
+    - if discussion.potentially_resolvable?
       - line_type = local_assigns.fetch(:line_type, nil)
 
       .btn-group-justified.discussion-with-resolve-btn{ role: "group" }
         .btn-group{ role: "group" }
           = link_to_reply_discussion(discussion, line_type)
+
         = render "discussions/resolve_all", discussion: discussion
-        - if discussion.for_merge_request?
-          .btn-group.discussion-actions
-            = render "discussions/new_issue_for_discussion", discussion: discussion, merge_request: discussion.noteable
-            = render "discussions/jump_to_next", discussion: discussion
+        
+        .btn-group.discussion-actions
+          = render "discussions/new_issue_for_discussion", discussion: discussion, merge_request: discussion.noteable
+          = render "discussions/jump_to_next", discussion: discussion
     - else
       = link_to_reply_discussion(discussion)
diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml
index e30ee1b0e05..689a22acd27 100644
--- a/app/views/discussions/_resolve_all.html.haml
+++ b/app/views/discussions/_resolve_all.html.haml
@@ -1,9 +1,8 @@
-- if discussion.for_merge_request?
-  %resolve-discussion-btn{ ":discussion-id" => "'#{discussion.id}'",
-      ":merge-request-id" => discussion.noteable.iid,
-      ":can-resolve" => discussion.can_resolve?(current_user),
-      "inline-template" => true }
-    .btn-group{ role: "group", "v-if" => "showButton" }
-      %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak" => "true" }
-        = icon("spinner spin", "v-show" => "loading")
-        {{ buttonText }}
+%resolve-discussion-btn{ ":discussion-id" => "'#{discussion.id}'",
+    ":merge-request-id" => discussion.noteable.iid,
+    ":can-resolve" => discussion.can_resolve?(current_user),
+    "inline-template" => true }
+  .btn-group{ role: "group", "v-if" => "showButton" }
+    %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak" => "true" }
+      = icon("spinner spin", "v-show" => "loading")
+      {{ buttonText }}