From d7aa7bad518cf1cad3ff9a0a11af91a609a6cd6b Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Tue, 30 Oct 2018 17:36:26 -0500
Subject: Remove gitlab-ui's modal from global

---
 app/assets/javascripts/commons/gitlab_ui.js                        | 4 ----
 .../pages/projects/wikis/components/delete_wiki_modal.vue          | 7 +++++++
 .../javascripts/set_status_modal/set_status_modal_wrapper.vue      | 2 ++
 changelogs/unreleased/gl-ui-modal.yml                              | 5 +++++
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/unreleased/gl-ui-modal.yml

diff --git a/app/assets/javascripts/commons/gitlab_ui.js b/app/assets/javascripts/commons/gitlab_ui.js
index f60665577fe..64a748d29db 100644
--- a/app/assets/javascripts/commons/gitlab_ui.js
+++ b/app/assets/javascripts/commons/gitlab_ui.js
@@ -2,16 +2,12 @@ import Vue from 'vue';
 import {
   GlPagination,
   GlProgressBar,
-  GlModal,
   GlLoadingIcon,
-  GlModalDirective,
   GlTooltipDirective,
 } from '@gitlab-org/gitlab-ui';
 
 Vue.component('gl-pagination', GlPagination);
 Vue.component('gl-progress-bar', GlProgressBar);
-Vue.component('gl-ui-modal', GlModal);
 Vue.component('gl-loading-icon', GlLoadingIcon);
 
-Vue.directive('gl-modal', GlModalDirective);
 Vue.directive('gl-tooltip', GlTooltipDirective);
diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
index 75cb6374ad5..819650f38ff 100644
--- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
@@ -1,8 +1,15 @@
 <script>
 import _ from 'underscore';
 import { s__, sprintf } from '~/locale';
+import { GlModal, GlModalDirective } from '@gitlab-org/gitlab-ui';
 
 export default {
+  components: {
+    'gl-ui-modal': GlModal,
+  },
+  directives: {
+    'gl-modal': GlModalDirective,
+  },
   props: {
     deleteWikiUrl: {
       type: String,
diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
index 43f0b6651b9..f2b2105292a 100644
--- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
+++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
@@ -5,6 +5,7 @@ import Icon from '~/vue_shared/components/icon.vue';
 import GfmAutoComplete from '~/gfm_auto_complete';
 import { __, s__ } from '~/locale';
 import Api from '~/api';
+import { GlModal } from '@gitlab-org/gitlab-ui';
 import eventHub from './event_hub';
 import EmojiMenuInModal from './emoji_menu_in_modal';
 
@@ -13,6 +14,7 @@ const emojiMenuClass = 'js-modal-status-emoji-menu';
 export default {
   components: {
     Icon,
+    'gl-ui-modal': GlModal,
   },
   props: {
     currentEmoji: {
diff --git a/changelogs/unreleased/gl-ui-modal.yml b/changelogs/unreleased/gl-ui-modal.yml
new file mode 100644
index 00000000000..fbdb8260d24
--- /dev/null
+++ b/changelogs/unreleased/gl-ui-modal.yml
@@ -0,0 +1,5 @@
+---
+title: Remove gitlab-ui's modal from global
+merge_request:
+author:
+type: performance
-- 
cgit v1.2.1