diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-22 13:51:37 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-07-24 07:15:30 -0700 |
| commit | af84629715a6be8cc0b2c3c9bbd59ca89cc31f78 (patch) | |
| tree | fc033f7a65ec227140e3f59538ddea21750f9a3c | |
| parent | fb362795ce5ed63a34cd5b832ece22e5f712d851 (diff) | |
| download | gitlab-ce-af84629715a6be8cc0b2c3c9bbd59ca89cc31f78.tar.gz | |
Fix Error 500 when creating Wiki pages with hyphens or spaces
Closes gitlab-com/support-forum#874
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 971a709e4c1..fdd140d5e44 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,9 @@ v 8.11.0 (unreleased) v 8.10.1 (unreleased) - Fix bug where replies to commit notes displayed in the MR discussion tab wouldn't show up on the commit page +v 8.10.1 (unreleased) + - Fix Error 500 when creating Wiki pages with hyphens or spaces + v 8.10.0 - Fix profile activity heatmap to show correct day name (eanplatter) - Speed up ExternalWikiHelper#get_project_wiki_path diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index d03d5e2ca6a..28cb6c56650 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -5,8 +5,8 @@ - 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, @page.title) + - if @project_wiki && @page && @page.slug.present? + - markdown_preview_path = namespace_project_wiki_markdown_preview_path(project.namespace, project, @page.slug) - else - markdown_preview_path = markdown_preview_namespace_project_path(project.namespace, project) - if current_user |