Fix discussion partials

app/views/discussions/_diff_discussion.html.haml

@@ -7,6 +7,6 @@
     .discussion-reply-holder
       .discussion-with-resolve-btn{ role: "group" }
         .btn-group
-          = link_to_reply_discussion(note)
+          = link_to_reply_discussion(discussion)
         .btn-group
-          = render "projects/notes/discussions/resolve_all", note: note
+          = render "discussions/resolve_all", discussion: discussion

app/views/discussions/_parallel_diff_discussion.html.haml

@@ -8,9 +8,9 @@
       .discussion-reply-holder
         .btn-group-justified.discussion-with-resolve-btn{ role: "group" }
           .btn-group{ role: "group" }
-            = link_to_reply_discussion(note_left, 'old')
+            = link_to_reply_discussion(discussion_left, 'old')
           .btn-group{ role: "group" }
-            = render "projects/notes/discussions/resolve_all", note: note_left
+            = render "discussions/resolve_all", discussion: discussion_left
   - else
     %td.notes_line.old= ""
     %td.notes_content.parallel.old= ""
@@ -24,9 +24,9 @@
       .discussion-reply-holder
         .btn-group-justified.discussion-with-resolve-btn{ role: "group" }
           .btn-group{ role: "group" }
-            = link_to_reply_discussion(note_right, 'new')
+            = link_to_reply_discussion(discussion_right, 'new')
           .btn-group{ role: "group" }
-            = render "projects/notes/discussions/resolve_all", note: note_right
+            = render "discussions/resolve_all", discussion: discussion_right
   - else
     %td.notes_line.new= ""
     %td.notes_content.parallel.new= ""

app/views/projects/notes/discussions/_resolve_all.html.haml → app/views/discussions/_resolve_all.html.haml

-%resolve-all{ ":namespace" => "'#{note.project.namespace.path}/#{note.project.path}'", ":discussion-id" => "'#{note.discussion_id}'", "inline-template" => true, "v-cloak" => true }
+%resolve-all{ ":namespace" => "'#{discussion.project.namespace.path}/#{discussion.project.path}'", ":discussion-id" => "'#{discussion.id}'", "inline-template" => true, "v-cloak" => true }
   %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading" }
     = icon("spinner spin", "v-show" => "loading")
     {{ buttonText }}