Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 2 deletions

diff --git a/app/assets/javascripts/mr_notes/index.js b/app/assets/javascripts/mr_notes/index.js
index fb6ef0249bb..c6243175cff 100644
--- a/app/assets/javascripts/mr_notes/index.js
+++ b/app/assets/javascripts/mr_notes/index.js
@@ -1,12 +1,13 @@
 import Vue from 'vue';
 import store from '~/mr_notes/stores';
-import initNotesApp from './init_notes';
 import initDiffsApp from '../diffs';
 import discussionCounter from '../notes/components/discussion_counter.vue';
 import initDiscussionFilters from '../notes/discussion_filters';
 import initSortDiscussions from '../notes/sort_discussions';
 import MergeRequest from '../merge_request';
 import { resetServiceWorkersPublicPath } from '../lib/utils/webpack';
+import initNotesApp from './init_notes';
+import initRevertCommitModal from '~/projects/commit/init_revert_commit_modal';
 
 export default function initMrNotes() {
   resetServiceWorkersPublicPath();
@@ -19,6 +20,10 @@ export default function initMrNotes() {
 
   initNotesApp();
 
+  document.addEventListener('merged:UpdateActions', () => {
+    initRevertCommitModal();
+  });
+
   // eslint-disable-next-line no-new
   new Vue({
     el: '#js-vue-discussion-counter',
diff --git a/app/assets/javascripts/mr_notes/init_notes.js b/app/assets/javascripts/mr_notes/init_notes.js
index ab88a610469..958ee8e226a 100644
--- a/app/assets/javascripts/mr_notes/init_notes.js
+++ b/app/assets/javascripts/mr_notes/init_notes.js
@@ -2,10 +2,10 @@ import $ from 'jquery';
 import Vue from 'vue';
 import { mapActions, mapState, mapGetters } from 'vuex';
 import store from '~/mr_notes/stores';
+import { parseBoolean } from '~/lib/utils/common_utils';
 import notesApp from '../notes/components/notes_app.vue';
 import discussionNavigator from '../notes/components/discussion_navigator.vue';
 import initWidget from '../vue_merge_request_widget';
-import { parseBoolean } from '~/lib/utils/common_utils';
 
 export default () => {
   // eslint-disable-next-line no-new