Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

3 files changed, 13 insertions, 6 deletions

diff --git a/app/assets/javascripts/mr_notes/index.js b/app/assets/javascripts/mr_notes/index.js
index fb6ef0249bb..a7696a716d0 100644
--- a/app/assets/javascripts/mr_notes/index.js
+++ b/app/assets/javascripts/mr_notes/index.js
@@ -1,12 +1,14 @@
 import Vue from 'vue';
 import store from '~/mr_notes/stores';
-import initNotesApp from './init_notes';
+import initCherryPickCommitModal from '~/projects/commit/init_cherry_pick_commit_modal';
+import initRevertCommitModal from '~/projects/commit/init_revert_commit_modal';
 import initDiffsApp from '../diffs';
+import { resetServiceWorkersPublicPath } from '../lib/utils/webpack';
+import MergeRequest from '../merge_request';
 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';
 
 export default function initMrNotes() {
   resetServiceWorkersPublicPath();
@@ -19,6 +21,11 @@ export default function initMrNotes() {
 
   initNotesApp();
 
+  document.addEventListener('merged:UpdateActions', () => {
+    initRevertCommitModal();
+    initCherryPickCommitModal();
+  });
+
   // 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..9a93e90c2bb 100644
--- a/app/assets/javascripts/mr_notes/init_notes.js
+++ b/app/assets/javascripts/mr_notes/init_notes.js
@@ -1,11 +1,11 @@
 import $ from 'jquery';
 import Vue from 'vue';
 import { mapActions, mapState, mapGetters } from 'vuex';
+import { parseBoolean } from '~/lib/utils/common_utils';
 import store from '~/mr_notes/stores';
-import notesApp from '../notes/components/notes_app.vue';
 import discussionNavigator from '../notes/components/discussion_navigator.vue';
+import notesApp from '../notes/components/notes_app.vue';
 import initWidget from '../vue_merge_request_widget';
-import { parseBoolean } from '~/lib/utils/common_utils';
 
 export default () => {
   // eslint-disable-next-line no-new
diff --git a/app/assets/javascripts/mr_notes/stores/index.js b/app/assets/javascripts/mr_notes/stores/index.js
index 8492b8d0aff..4a0602ad512 100644
--- a/app/assets/javascripts/mr_notes/stores/index.js
+++ b/app/assets/javascripts/mr_notes/stores/index.js
@@ -1,8 +1,8 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
 import batchCommentsModule from '~/batch_comments/stores/modules/batch_comments';
-import notesModule from '~/notes/stores/modules';
 import diffsModule from '~/diffs/store/modules';
+import notesModule from '~/notes/stores/modules';
 import mrPageModule from './modules';
 
 Vue.use(Vuex);