diff options
| author | Chris Baumbauer <cab@cabnetworks.net> | 2018-11-02 08:39:25 -0700 |
|---|---|---|
| committer | Chris Baumbauer <cab@cabnetworks.net> | 2018-11-02 08:39:25 -0700 |
| commit | dc078c241765cfea5f49409407b82db7296c132d (patch) | |
| tree | deeabb4b302f896b60ffe8e27163a4dddf625c4b /app/assets/javascripts/vue_shared/components/markdown/toolbar.vue | |
| parent | 28a9bbceb7ab5ffe2305db02052d663b1e68ab8e (diff) | |
| parent | a80ee886e4b4a41ace5fb796bf920c4e395bf4dd (diff) | |
| download | gitlab-ce-dc078c241765cfea5f49409407b82db7296c132d.tar.gz | |
Merge branch 'master' into triggermesh-phase1-knative
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: { |