BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
96a46521
Commit
96a46521
authored
May 15, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added markdown docs link
[ci skip]
parent
aa6d92ae
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
52 additions
and
26 deletions
+52
-26
app.vue
app/assets/javascripts/issue_show/components/app.vue
+6
-5
description.vue
app/assets/javascripts/issue_show/components/description.vue
+21
-17
description.vue
.../javascripts/issue_show/components/fields/description.vue
+6
-1
index.js
app/assets/javascripts/issue_show/index.js
+3
-0
field.vue
...sets/javascripts/vue_shared/components/markdown/field.vue
+6
-1
toolbar.vue
...ts/javascripts/vue_shared/components/markdown/toolbar.vue
+9
-2
show.html.haml
app/views/projects/issues/show.html.haml
+1
-0
No files found.
app/assets/javascripts/issue_show/components/app.vue
View file @
96a46521
...
...
@@ -45,6 +45,10 @@ export default {
type
:
String
,
required
:
true
,
},
markdownDocs
:
{
type
:
String
,
required
:
true
,
},
},
data
()
{
const
store
=
new
Store
({
...
...
@@ -152,11 +156,8 @@ export default {
:store=
"store"
:show-form=
"showForm"
:can-update=
"canUpdate"
:description-html=
"state.descriptionHtml"
:description-text=
"state.descriptionText"
:updated-at=
"state.updatedAt"
:task-status=
"state.taskStatus"
:markdown-preview-url=
"markdownPreviewUrl"
/>
:markdown-preview-url=
"markdownPreviewUrl"
:markdown-docs=
"markdownDocs"
/>
<edit-actions
v-if=
"canUpdate && showForm"
:can-destroy=
"canDestroy"
/>
...
...
app/assets/javascripts/issue_show/components/description.vue
View file @
96a46521
...
...
@@ -9,22 +9,6 @@
type
:
Boolean
,
required
:
true
,
},
descriptionHtml
:
{
type
:
String
,
required
:
true
,
},
descriptionText
:
{
type
:
String
,
required
:
true
,
},
updatedAt
:
{
type
:
String
,
required
:
true
,
},
taskStatus
:
{
type
:
String
,
required
:
true
,
},
store
:
{
type
:
Object
,
required
:
true
,
...
...
@@ -37,14 +21,33 @@
type
:
String
,
required
:
true
,
},
markdownDocs
:
{
type
:
String
,
required
:
true
,
},
},
data
()
{
return
{
state
:
this
.
store
.
state
,
preAnimation
:
false
,
pulseAnimation
:
false
,
timeAgoEl
:
$
(
'.js-issue-edited-ago'
),
};
},
computed
:
{
descriptionHtml
()
{
return
this
.
state
.
descriptionHtml
;
},
descriptionText
()
{
return
this
.
state
.
descriptionText
;
},
updatedAt
()
{
return
this
.
state
.
updated_at
;
},
taskStatus
()
{
return
this
.
state
.
taskStatus
;
},
},
watch
:
{
descriptionHtml
()
{
this
.
animateChange
();
...
...
@@ -102,7 +105,8 @@
<description-field
v-if=
"showForm"
:store=
"store"
:markdown-preview-url=
"markdownPreviewUrl"
/>
:markdown-preview-url=
"markdownPreviewUrl"
:markdown-docs=
"markdownDocs"
/>
<div
v-else-if=
"descriptionHtml"
class=
"description"
...
...
app/assets/javascripts/issue_show/components/fields/description.vue
View file @
96a46521
...
...
@@ -12,6 +12,10 @@
type
:
String
,
required
:
true
,
},
markdownDocs
:
{
type
:
String
,
required
:
true
,
},
},
data
()
{
return
{
...
...
@@ -32,7 +36,8 @@
Description
</label>
<markdown-field
:markdown-preview-url=
"markdownPreviewUrl"
>
:markdown-preview-url=
"markdownPreviewUrl"
:markdown-docs=
"markdownDocs"
>
<textarea
id=
"issue-description"
class=
"note-textarea js-gfm-input js-autosize markdown-area"
...
...
app/assets/javascripts/issue_show/index.js
View file @
96a46521
...
...
@@ -26,6 +26,7 @@ document.addEventListener('DOMContentLoaded', () => {
endpoint
,
issuableRef
,
markdownPreviewUrl
,
markdownDocs
,
}
=
issuableElement
.
dataset
;
return
{
...
...
@@ -37,6 +38,7 @@ document.addEventListener('DOMContentLoaded', () => {
initialDescriptionHtml
:
issuableDescriptionElement
?
issuableDescriptionElement
.
innerHTML
:
''
,
initialDescriptionText
:
issuableDescriptionTextarea
?
issuableDescriptionTextarea
.
textContent
:
''
,
markdownPreviewUrl
,
markdownDocs
,
};
},
render
(
createElement
)
{
...
...
@@ -50,6 +52,7 @@ document.addEventListener('DOMContentLoaded', () => {
initialDescriptionHtml
:
this
.
initialDescriptionHtml
,
initialDescriptionText
:
this
.
initialDescriptionText
,
markdownPreviewUrl
:
this
.
markdownPreviewUrl
,
markdownDocs
:
this
.
markdownDocs
,
},
});
},
...
...
app/assets/javascripts/vue_shared/components/markdown/field.vue
View file @
96a46521
...
...
@@ -10,6 +10,10 @@
required
:
false
,
default
:
''
,
},
markdownDocs
:
{
type
:
String
,
required
:
true
,
},
},
data
()
{
return
{
...
...
@@ -84,7 +88,8 @@
aria-hidden=
"true"
>
</i>
</a>
<markdown-toolbar
/>
<markdown-toolbar
:markdown-docs=
"markdownDocs"
/>
</div>
</div>
<div
...
...
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
View file @
96a46521
<
script
>
export
default
{
props
:
{
markdownDocs
:
{
type
:
String
,
required
:
true
,
},
},
};
</
script
>
<
template
>
<div
class=
"comment-toolbar clearfix"
>
<div
class=
"toolbar-text"
>
<a
href=
"/d
ocs"
:href=
"markdownD
ocs"
target=
"_blank"
tabindex=
"-1"
>
Markdown is supported
...
...
app/views/projects/issues/show.html.haml
View file @
96a46521
...
...
@@ -56,6 +56,7 @@
"can-destroy"
=>
can?
(
current_user
,
:destroy_issue
,
@issue
).
to_s
,
"issuable-ref"
=>
@issue
.
to_reference
,
"markdown-preview-url"
=>
preview_markdown_path
(
@project
),
"markdown-docs"
=>
help_page_path
(
'user/markdown'
),
}
}
%h2
.title
=
markdown_field
(
@issue
,
:title
)
-
if
@issue
.
description
.
present?
...
...
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