Merge branch '24915_merge_slash_command' into 'master'

Support `/merge` slash command for MRs

Closes #24915

See merge request !7746

1 files changed, 12 insertions, 0 deletions

diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 603db88567d..fac21f8cd32 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -3,6 +3,7 @@
 /* global GLForm */
 /* global Autosave */
 /* global ResolveService */
+/* global mrRefreshWidgetUrl */
 
 /*= require autosave */
 /*= require autosize */
@@ -244,6 +245,16 @@
     };
 
 
+    Notes.prototype.handleCreateChanges = function(note) {
+      if (typeof note === 'undefined') {
+        return;
+      }
+
+      if (note.commands_changes && note.commands_changes.indexOf('merge') !== -1) {
+        $.get(mrRefreshWidgetUrl);
+      }
+    };
+
     /*
     Render note in main comments area.
 
@@ -429,6 +440,7 @@
      */
 
     Notes.prototype.addNote = function(xhr, note, status) {
+      this.handleCreateChanges(note);
       return this.renderNote(note);
     };