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
2d7516ff
Commit
2d7516ff
authored
Jul 21, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '20079-new-wiki-page-500' into 'master'
Don't use `params[:id]` while building `markdown_preview_path`. - Closes #20079 See merge request !5400
parents
4e40ba93
2ba5e625
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
project.html.haml
app/views/layouts/project.html.haml
+1
-1
No files found.
app/views/layouts/project.html.haml
View file @
2d7516ff
...
...
@@ -6,7 +6,7 @@
-
content_for
:scripts_body_top
do
-
project
=
@target_project
||
@project
-
if
@project_wiki
&&
@page
-
markdown_preview_path
=
namespace_project_wiki_markdown_preview_path
(
project
.
namespace
,
project
,
params
[
:id
]
)
-
markdown_preview_path
=
namespace_project_wiki_markdown_preview_path
(
project
.
namespace
,
project
,
@page
.
title
)
-
else
-
markdown_preview_path
=
markdown_preview_namespace_project_path
(
project
.
namespace
,
project
)
-
if
current_user
...
...
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