Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
167e3492
Commit
167e3492
authored
Sep 26, 2018
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-26
parents
5d8e0d80
912d068d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
app/assets/javascripts/boards/components/modal/lists_dropdown.vue
...ts/javascripts/boards/components/modal/lists_dropdown.vue
+6
-2
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
...ts/javascripts/vue_shared/components/markdown/toolbar.vue
+11
-6
No files found.
app/assets/javascripts/boards/components/modal/lists_dropdown.vue
View file @
167e3492
<
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>
...
...
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
View file @
167e3492
<
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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment