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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
b66a8203
Commit
b66a8203
authored
Sep 16, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved loading GFM source into zen.html.haml
parent
9c5638fb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+0
-1
app/views/projects/_zen.html.haml
app/views/projects/_zen.html.haml
+3
-1
No files found.
app/views/layouts/application.html.haml
View file @
b66a8203
...
@@ -10,5 +10,4 @@
...
@@ -10,5 +10,4 @@
=
render
"layouts/header/default"
,
title:
header_title
=
render
"layouts/header/default"
,
title:
header_title
=
render
'layouts/page'
,
sidebar:
sidebar
,
nav:
nav
=
render
'layouts/page'
,
sidebar:
sidebar
,
nav:
nav
=
render
"layouts/init_auto_complete"
if
current_user
&&
@load_gfm
=
yield
:scripts_body
=
yield
:scripts_body
app/views/projects/_zen.html.haml
View file @
b66a8203
-
@load_gfm
=
!
(
@target_project
||
@project
).
nil?
-
supports_slash_commands
=
local_assigns
.
fetch
(
:supports_slash_commands
,
false
)
-
supports_slash_commands
=
local_assigns
.
fetch
(
:supports_slash_commands
,
false
)
.zen-backdrop
.zen-backdrop
-
classes
<<
' js-gfm-input js-autosize markdown-area'
-
classes
<<
' js-gfm-input js-autosize markdown-area'
...
@@ -8,3 +7,6 @@
...
@@ -8,3 +7,6 @@
=
text_area_tag
attr
,
nil
,
class:
classes
,
placeholder:
placeholder
=
text_area_tag
attr
,
nil
,
class:
classes
,
placeholder:
placeholder
%a
.zen-control.zen-control-leave.js-zen-leave
{
href:
"#"
}
%a
.zen-control.zen-control-leave.js-zen-leave
{
href:
"#"
}
=
icon
(
'compress'
)
=
icon
(
'compress'
)
-
content_for
:scripts_body
do
=
render
"layouts/init_auto_complete"
if
current_user
&&
(
@target_project
||
@project
)
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