Automatic merge of gitlab-org/gitlab-ce master

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>
 

changelogs/unreleased/60855-mr-popover-is-not-attached-in-system-notes.yml

----
-title: Fix bug where system note MR has no popover
-merge_request: 27589
-author:
-type: fixed

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();
-  });
 });

spec/models/clusters/applications/runner_spec.rb

@@ -24,7 +24,7 @@ describe Clusters::Applications::Runner do
     it 'is initialized with 4 arguments' do
       expect(subject.name).to eq('runner')
       expect(subject.chart).to eq('runner/gitlab-runner')
-      expect(subject.version).to eq('0.4.0')
+      expect(subject.version).to eq(Clusters::Applications::Runner::VERSION)
       expect(subject).to be_rbac
       expect(subject.repository).to eq('https://charts.gitlab.io')
       expect(subject.files).to eq(gitlab_runner.files)
@@ -42,7 +42,7 @@ describe Clusters::Applications::Runner do
       let(:gitlab_runner) { create(:clusters_applications_runner, :errored, runner: ci_runner, version: '0.1.13') }
 
       it 'is initialized with the locked version' do
-        expect(subject.version).to eq('0.4.0')
+        expect(subject.version).to eq(Clusters::Applications::Runner::VERSION)
       end
     end
   end