summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-09-25 23:02:18 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-09-25 23:02:18 +0000
commit912d068dc6411af03af85cabb6bcaacbe64b5e80 (patch)
tree4045736134d779919910b47ccfaf6f3d133e308d
parent4d4522c15860529693305dc0fc0231c22eaf8a31 (diff)
parent3cf0ee6738e47f2e83f54904e1c194955143a689 (diff)
downloadgitlab-ce-912d068dc6411af03af85cabb6bcaacbe64b5e80.tar.gz
Merge branch 'jivl-glui-link' into 'master'4037-add-group-level-wiki
Add link component from gitlab-ui See merge request gitlab-org/gitlab-ce!21803
-rw-r--r--app/assets/javascripts/boards/components/modal/lists_dropdown.vue8
-rw-r--r--app/assets/javascripts/vue_shared/components/markdown/toolbar.vue17
2 files changed, 17 insertions, 8 deletions
diff --git a/app/assets/javascripts/boards/components/modal/lists_dropdown.vue b/app/assets/javascripts/boards/components/modal/lists_dropdown.vue
index 6a5a39099bd..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,
@@ -38,7 +42,7 @@ export default {
v-for="(list, i) in state.lists"
v-if="list.type == 'label'"
:key="i">
- <a
+ <gl-link
:class="{ 'is-active': list.id == selected.id }"
href="#"
role="button"
@@ -48,7 +52,7 @@ export default {
class="dropdown-label-box">
</span>
{{ list.title }}
- </a>
+ </gl-link>
</li>
</ul>
</div>
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
index d63318f3da6..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,
@@ -28,30 +33,30 @@
<div class="comment-toolbar clearfix">
<div class="toolbar-text">
<template v-if="!hasQuickActionsDocsPath && markdownDocsPath">
- <a
+ <gl-link
:href="markdownDocsPath"
target="_blank"
tabindex="-1"
>
Markdown is supported
- </a>
+ </gl-link>
</template>
<template v-if="hasQuickActionsDocsPath && markdownDocsPath">
- <a
+ <gl-link
:href="markdownDocsPath"
target="_blank"
tabindex="-1"
>
Markdown
- </a>
+ </gl-link>
and
- <a
+ <gl-link
:href="quickActionsDocsPath"
target="_blank"
tabindex="-1"
>
quick actions
- </a>
+ </gl-link>
are supported
</template>
</div>