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
5af733b4
Commit
5af733b4
authored
Jan 17, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed spec failure in JS caused by a different marked version
parent
1aecf77f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/deploy_keys/components/key.vue
app/assets/javascripts/deploy_keys/components/key.vue
+4
-3
app/assets/javascripts/notebook/cells/markdown.vue
app/assets/javascripts/notebook/cells/markdown.vue
+1
-2
package.json
package.json
+1
-1
yarn.lock
yarn.lock
+3
-3
No files found.
app/assets/javascripts/deploy_keys/components/key.vue
View file @
5af733b4
...
...
@@ -4,12 +4,12 @@
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
export
default
{
directives
:
{
tooltip
,
},
components
:
{
actionBtn
,
},
directives
:
{
tooltip
,
},
props
:
{
deployKey
:
{
type
:
Object
,
...
...
@@ -63,6 +63,7 @@
<div
class=
"deploy-key-content prepend-left-default deploy-key-projects"
>
<a
v-for=
"(deployKeysProject, i) in deployKey.deploy_keys_projects"
:key=
"i"
class=
"label deploy-project-label"
:href=
"deployKeysProject.project.full_path"
:title=
"tooltipTitle(deployKeysProject)"
...
...
app/assets/javascripts/notebook/cells/markdown.vue
View file @
5af733b4
...
...
@@ -99,8 +99,7 @@
<prompt
/>
<div
class=
"markdown"
v-html=
"markdown"
>
v-html=
"markdown"
>
</div>
</div>
</
template
>
...
...
package.json
View file @
5af733b4
...
...
@@ -56,7 +56,7 @@
"
js-cookie
"
:
"
^2.1.3
"
,
"
jszip
"
:
"
^3.1.3
"
,
"
jszip-utils
"
:
"
^0.0.2
"
,
"
marked
"
:
"
^0.3.
6
"
,
"
marked
"
:
"
^0.3.
12
"
,
"
monaco-editor
"
:
"
0.10.0
"
,
"
mousetrap
"
:
"
^1.4.6
"
,
"
name-all-modules-plugin
"
:
"
^1.0.1
"
,
...
...
yarn.lock
View file @
5af733b4
...
...
@@ -4203,9 +4203,9 @@ map-stream@~0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
marked@^0.3.
6
:
version "0.3.
6
"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.
6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7
"
marked@^0.3.
12
:
version "0.3.
12
"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.
12.tgz#7cf25ff2252632f3fe2406bde258e94eee927519
"
math-expression-evaluator@^1.2.14:
version "1.2.16"
...
...
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