Remove global registrationjivl-glui-link

6 files changed, 13 insertions, 11 deletions

diff --git a/app/assets/javascripts/boards/components/modal/lists_dropdown.vue b/app/assets/javascripts/boards/components/modal/lists_dropdown.vue
index 5e66a481e96..24f26169799 100644
--- a/app/assets/javascripts/boards/components/modal/lists_dropdown.vue
+++ b/app/assets/javascripts/boards/components/modal/lists_dropdown.vue
@@ -1,7 +1,11 @@
 <script>
+import Link from '@gitlab-org/gitlab-ui/dist/components/base/link';
 import ModalStore from '../../stores/modal_store';
 
 export default {
+  components: {
+    'gl-link': Link,
+  },
   data() {
     return {
       modal: ModalStore.store,
diff --git a/app/assets/javascripts/commons/gitlab_ui.js b/app/assets/javascripts/commons/gitlab_ui.js
index 900bd16c3c1..aed26adfa5c 100644
--- a/app/assets/javascripts/commons/gitlab_ui.js
+++ b/app/assets/javascripts/commons/gitlab_ui.js
@@ -3,7 +3,6 @@ import Pagination from '@gitlab-org/gitlab-ui/dist/components/base/pagination';
 import progressBar from '@gitlab-org/gitlab-ui/dist/components/base/progress_bar';
 import modal from '@gitlab-org/gitlab-ui/dist/components/base/modal';
 import loadingIcon from '@gitlab-org/gitlab-ui/dist/components/base/loading_icon';
-import link from '@gitlab-org/gitlab-ui/dist/components/base/link';
 
 import dModal from '@gitlab-org/gitlab-ui/dist/directives/modal';
 import dTooltip from '@gitlab-org/gitlab-ui/dist/directives/tooltip';
@@ -12,7 +11,6 @@ Vue.component('gl-pagination', Pagination);
 Vue.component('gl-progress-bar', progressBar);
 Vue.component('gl-ui-modal', modal);
 Vue.component('gl-loading-icon', loadingIcon);
-Vue.component('gl-link', link);
 
 Vue.directive('gl-modal', dModal);
 Vue.directive('gl-tooltip', dTooltip);
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
index 822683102c4..9d25003ccb7 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
@@ -1,5 +1,10 @@
 <script>
+  import Link from '@gitlab-org/gitlab-ui/dist/components/base/link';
+
   export default {
+    components: {
+      'gl-link': Link,
+    },
     props: {
       markdownDocsPath: {
         type: String,
diff --git a/changelogs/unreleased/jivl-glui-link.yml b/changelogs/unreleased/jivl-glui-link.yml
deleted file mode 100644
index cff753c4967..00000000000
--- a/changelogs/unreleased/jivl-glui-link.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add link component from gitlab-ui
-merge_request: 21803
-author:
-type: other
diff --git a/package.json b/package.json
index 24783e19814..94707fe3587 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@gitlab-org/gitlab-svgs": "^1.29.0",
-    "@gitlab-org/gitlab-ui": "^1.6.0",
+    "@gitlab-org/gitlab-ui": "^1.7.0",
     "autosize": "^4.0.0",
     "axios": "^0.17.1",
     "babel-core": "^6.26.3",
diff --git a/yarn.lock b/yarn.lock
index 232a7d05d38..cb26f59cb76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -164,9 +164,9 @@
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.29.0.tgz#03b65b513f9099bbda6ecf94d673a2952f8c6c70"
 
-"@gitlab-org/gitlab-ui@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.6.0.tgz#aabe33e13b22e4b157661b0c1f906c09a03cc3bf"
+"@gitlab-org/gitlab-ui@^1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.7.0.tgz#cf37b7262f90af42664d4d1600917271a8f8fb28"
   dependencies:
     "@gitlab-org/gitlab-svgs" "^1.23.0"
     bootstrap-vue "^2.0.0-rc.11"