From 4ab8c40e154933b645830b24fa86f3dad916498c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 17 Oct 2020 06:09:20 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/notes/index.js                     | 8 +++-----
 .../components/states/work_in_progress.vue                | 4 ----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/notes/index.js b/app/assets/javascripts/notes/index.js
index 3247a93f0a0..1f0b2afab9e 100644
--- a/app/assets/javascripts/notes/index.js
+++ b/app/assets/javascripts/notes/index.js
@@ -5,11 +5,9 @@ import initSortDiscussions from './sort_discussions';
 import initTimelineToggle from './timeline';
 import { store } from './stores';
 
-document.addEventListener('DOMContentLoaded', () => {
-  const el = document.getElementById('js-vue-notes');
-
-  if (!el) return;
+const el = document.getElementById('js-vue-notes');
 
+if (el) {
   // eslint-disable-next-line no-new
   new Vue({
     el,
@@ -61,4 +59,4 @@ document.addEventListener('DOMContentLoaded', () => {
   initDiscussionFilters(store);
   initSortDiscussions(store);
   initTimelineToggle(store);
-});
+}
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
index be9d37e4531..eba3d50fdc9 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
@@ -10,7 +10,6 @@ import getStateQuery from '../../queries/get_state.query.graphql';
 import workInProgressQuery from '../../queries/states/work_in_progress.query.graphql';
 import removeWipMutation from '../../queries/toggle_wip.mutation.graphql';
 import StatusIcon from '../mr_widget_status_icon.vue';
-import tooltip from '../../../vue_shared/directives/tooltip';
 import eventHub from '../../event_hub';
 
 export default {
@@ -19,9 +18,6 @@ export default {
     StatusIcon,
     GlButton,
   },
-  directives: {
-    tooltip,
-  },
   mixins: [glFeatureFlagMixin(), mergeRequestQueryVariablesMixin],
   apollo: {
     userPermissions: {