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> <script>
import Link from '@gitlab-org/gitlab-ui/dist/components/base/link';
import ModalStore from '../../stores/modal_store'; import ModalStore from '../../stores/modal_store';
export default { export default {
components: {
'gl-link': Link,
},
data() { data() {
return { return {
modal: ModalStore.store, modal: ModalStore.store,
...@@ -38,7 +42,7 @@ export default { ...@@ -38,7 +42,7 @@ export default {
v-for="(list, i) in state.lists" v-for="(list, i) in state.lists"
v-if="list.type == 'label'" v-if="list.type == 'label'"
:key="i"> :key="i">
<a <gl-link
:class="{ 'is-active': list.id == selected.id }" :class="{ 'is-active': list.id == selected.id }"
href="#" href="#"
role="button" role="button"
...@@ -48,7 +52,7 @@ export default { ...@@ -48,7 +52,7 @@ export default {
class="dropdown-label-box"> class="dropdown-label-box">
</span> </span>
{{ list.title }} {{ list.title }}
</a> </gl-link>
</li> </li>
</ul> </ul>
</div> </div>
......
<script> <script>
import Link from '@gitlab-org/gitlab-ui/dist/components/base/link';
export default { export default {
components: {
'gl-link': Link,
},
props: { props: {
markdownDocsPath: { markdownDocsPath: {
type: String, type: String,
...@@ -28,30 +33,30 @@ ...@@ -28,30 +33,30 @@
<div class="comment-toolbar clearfix"> <div class="comment-toolbar clearfix">
<div class="toolbar-text"> <div class="toolbar-text">
<template v-if="!hasQuickActionsDocsPath && markdownDocsPath"> <template v-if="!hasQuickActionsDocsPath && markdownDocsPath">
<a <gl-link
:href="markdownDocsPath" :href="markdownDocsPath"
target="_blank" target="_blank"
tabindex="-1" tabindex="-1"
> >
Markdown is supported Markdown is supported
</a> </gl-link>
</template> </template>
<template v-if="hasQuickActionsDocsPath && markdownDocsPath"> <template v-if="hasQuickActionsDocsPath && markdownDocsPath">
<a <gl-link
:href="markdownDocsPath" :href="markdownDocsPath"
target="_blank" target="_blank"
tabindex="-1" tabindex="-1"
> >
Markdown Markdown
</a> </gl-link>
and and
<a <gl-link
:href="quickActionsDocsPath" :href="quickActionsDocsPath"
target="_blank" target="_blank"
tabindex="-1" tabindex="-1"
> >
quick actions quick actions
</a> </gl-link>
are supported are supported
</template> </template>
</div> </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