summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-04-30 08:40:21 -0700
committerStan Hu <stanhu@gmail.com>2015-04-30 08:54:08 -0700
commitd79348ab55c668883aa8d2a7fd5b59f28eb5118a (patch)
treef06a5c9b953d9650dd006d022af3d553ecb0e8cc /app
parent39a55bdf1a1613f362bcd7da444b291210454160 (diff)
downloadgitlab-ce-d79348ab55c668883aa8d2a7fd5b59f28eb5118a.tar.gz
Fix Error 500 when searching Wiki pages
Closes #1547
Diffstat (limited to 'app')
-rw-r--r--app/helpers/wiki_helper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index a3bc64c010e..f8a96516e61 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -6,6 +6,8 @@ module WikiHelper
case wiki_page
when Symbol
wiki_page
+ when String
+ wiki_page
else
wiki_page.slug
end