diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-10-30 10:18:38 +0300 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-10-30 10:18:38 +0300 |
| commit | d0b746d8d68665c6359fddbe958e0c818a36f3bb (patch) | |
| tree | df5d9d660a7565f95f305419a5959bce7d4a8468 /app/assets/javascripts/vue_shared/components/markdown/toolbar.vue | |
| parent | 06b6daacb15b92b04e05538b37aadfdb04fc5a4b (diff) | |
| parent | 5a953741820b78492333e1543062a5c222694d8c (diff) | |
Merge remote-tracking branch 'origin/master' into dev-master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/markdown/toolbar.vue')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/toolbar.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue index feb7b8f227e..b0a93794013 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue @@ -1,9 +1,9 @@ <script> -import { Link } from '@gitlab-org/gitlab-ui'; +import { GlLink } from '@gitlab-org/gitlab-ui'; export default { components: { - 'gl-link': Link, + GlLink, }, props: { markdownDocsPath: { |