Commit 167e3492 authored by GitLab Bot's avatar GitLab Bot

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-26

parents 5d8e0d80 912d068d
<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>
......
<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>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment