Merge branch 'revert-55767af4' into 'master'

Revert "Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into 'master'"

See merge request gitlab-org/gitlab-ce!27727

3 files changed, 0 insertions, 15 deletions

diff --git a/app/assets/javascripts/vue_shared/components/notes/system_note.vue b/app/assets/javascripts/vue_shared/components/notes/system_note.vue
index 3c86b7e4c61..acc179b3834 100644
--- a/app/assets/javascripts/vue_shared/components/notes/system_note.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/system_note.vue
@@ -22,7 +22,6 @@ import noteHeader from '~/notes/components/note_header.vue';
 import Icon from '~/vue_shared/components/icon.vue';
 import TimelineEntryItem from './timeline_entry_item.vue';
 import { spriteIcon } from '../../../lib/utils/common_utils';
-import initMRPopovers from '~/mr_popover/';
 
 const MAX_VISIBLE_COMMIT_LIST_COUNT = 3;
 
@@ -72,9 +71,6 @@ export default {
       );
     },
   },
-  mounted() {
-    initMRPopovers(this.$el.querySelectorAll('.gfm-merge_request'));
-  },
 };
 </script>
 
diff --git a/changelogs/unreleased/60855-mr-popover-is-not-attached-in-system-notes.yml b/changelogs/unreleased/60855-mr-popover-is-not-attached-in-system-notes.yml
deleted file mode 100644
index f7017ddf3dd..00000000000
--- a/changelogs/unreleased/60855-mr-popover-is-not-attached-in-system-notes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix bug where system note MR has no popover
-merge_request: 27589
-author:
-type: fixed
diff --git a/spec/frontend/vue_shared/components/notes/system_note_spec.js b/spec/frontend/vue_shared/components/notes/system_note_spec.js
index 5b4ca20940a..adcb1c858aa 100644
--- a/spec/frontend/vue_shared/components/notes/system_note_spec.js
+++ b/spec/frontend/vue_shared/components/notes/system_note_spec.js
@@ -5,10 +5,8 @@ import createStore from '~/notes/stores';
 describe('system note component', () => {
   let vm;
   let props;
-  let initMRPopoversSpy;
 
   beforeEach(() => {
-    initMRPopoversSpy = spyOnDependency(issueSystemNote, 'initMRPopovers');
     props = {
       note: {
         id: '1424',
@@ -58,8 +56,4 @@ describe('system note component', () => {
   it('removes wrapping paragraph from note HTML', () => {
     expect(vm.$el.querySelector('.system-note-message').innerHTML).toEqual('<span>closed</span>');
   });
-
-  it('should initMRPopovers onMount', () => {
-    expect(initMRPopoversSpy).toHaveBeenCalled();
-  });
 });