Address MR comments

5 files changed, 15 insertions, 6 deletions

diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 0016070b648..fac21f8cd32 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -250,7 +250,7 @@
         return;
       }
 
-      if (note.commands_changes && note.commands_changes.includes('merge')) {
+      if (note.commands_changes && note.commands_changes.indexOf('merge') !== -1) {
         $.get(mrRefreshWidgetUrl);
       }
     };
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 72dcf020c9f..6d6115413a5 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -348,7 +348,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def merge_widget_refresh
-    if merge_request.in_progress_merge_commit_sha
+    if merge_request.in_progress_merge_commit_sha || merge_request.state == 'merged'
       @status = :success
     elsif merge_request.merge_when_build_succeeds
       @status = :merge_when_build_succeeds
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 20218775659..8c2c4e8833b 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -19,6 +19,14 @@ module MergeRequestsHelper
     }
   end
 
+  def mr_widget_refresh_url(mr)
+    if mr && mr.source_project
+      merge_widget_refresh_namespace_project_merge_request_url(mr.source_project.namespace, mr.source_project, mr)
+    else
+      ''
+    end
+  end
+
   def mr_css_classes(mr)
     classes = "merge-request"
     classes << " closed" if mr.closed?
diff --git a/app/services/slash_commands/interpret_service.rb b/app/services/slash_commands/interpret_service.rb
index 14fad3ba120..d18844ac0e3 100644
--- a/app/services/slash_commands/interpret_service.rb
+++ b/app/services/slash_commands/interpret_service.rb
@@ -61,10 +61,10 @@ module SlashCommands
 
     desc 'Merge (when build succeeds)'
     condition do
-      last_diff_sha = params.to_h[:merge_request_diff_head_sha]
+      last_diff_sha = params && params[:merge_request_diff_head_sha]
       issuable.is_a?(MergeRequest) &&
-        issuable.mergeable_with_slash_command?(current_user, autocomplete_precheck: !last_diff_sha, last_diff_sha: last_diff_sha) &&
-        issuable.persisted?
+        issuable.persisted? &&
+        issuable.mergeable_with_slash_command?(current_user, autocomplete_precheck: !last_diff_sha, last_diff_sha: last_diff_sha)
     end
     command :merge do
       @updates[:merge] = params[:merge_request_diff_head_sha]
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 2e7cd52df1e..d95017286ba 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -113,4 +113,5 @@
     action: "#{controller.action_name}"
   });
 
-  var mrRefreshWidgetUrl = "#{@merge_request && @merge_request.source_project ? merge_widget_refresh_namespace_project_merge_request_url(@merge_request.source_project.namespace, @merge_request.source_project, @merge_request) : ''}";
+  var mrRefreshWidgetUrl = "#{mr_widget_refresh_url(@merge_request)}";
+