diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-21 14:57:31 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-07-21 14:57:31 +0000 |
| commit | 2d7516ffbdacc488016573752c6672fb5a15dcc5 (patch) | |
| tree | e07c7435d2ca3c5481ec5f119242107acf87a2b5 | |
| parent | 4e40ba93dcfc339ab4baa47ef39e1a570e4fc902 (diff) | |
| parent | 2ba5e6259e14f9bc9f60201da249a5a313bbd0db (diff) | |
| download | gitlab-ce-2d7516ffbdacc488016573752c6672fb5a15dcc5.tar.gz | |
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
| -rw-r--r-- | app/views/layouts/project.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 2049b204956..d03d5e2ca6a 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -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 |