Don’t show “Resolve discussion” for non-author/members

1 files changed, 8 insertions, 8 deletions

diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml
index 5d751c60d2a..7a8767ddba0 100644
--- a/app/views/discussions/_resolve_all.html.haml
+++ b/app/views/discussions/_resolve_all.html.haml
@@ -1,11 +1,11 @@
-- if discussion.can_resolve?(current_user)
-  .btn-group{ role: "group" }
-    %resolve-discussion-btn{ ":namespace-path" => "'#{discussion.project.namespace.path}'",
-        ":project-path" => "'#{discussion.project.path}'",
-        ":discussion-id" => "'#{discussion.id}'",
-        ":merge-request-id" => "#{discussion.noteable.iid}",
-        "inline-template" => true,
-        "v-cloak" => true }
+- if discussion.for_merge_request?
+  %resolve-discussion-btn{ ":namespace-path" => "'#{discussion.project.namespace.path}'",
+      ":project-path" => "'#{discussion.project.path}'",
+      ":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" }
         = icon("spinner spin", "v-show" => "loading")
         {{ buttonText }}