gitlab-org--gitlab-foss/app
Dmitriy Zaporozhets 16db51ec58 Merge branch 'fix-wiki-search' into 'master'
Fix Error 500 when searching Wiki pages

If a Wiki page turns up a hit in the search results, an error will occur:

```
Completed 500 Internal Server Error in 836ms

NoMethodError - undefined method `slug' for "test.markdown":String:
  app/helpers/wiki_helper.rb:10:in `namespace_project_wiki_path'
  app/views/search/results/_wiki_blob.html.haml:4:in `_app_views_search_results__wiki_blob_html_haml___2752621660395393333_70299911622700'
  actionview (4.1.9) lib/action_view/template.rb:145:in `block in render'
  activesupport (4.1.9) lib/active_support/notifications.rb:161:in `instrument'
  actionview (4.1.9) lib/action_view/template.rb:339:in `instrument'
  actionview (4.1.9) lib/action_view/template.rb:143:in `render'
```

An unhandled String containing the name of the Wiki page would be provided to the URL path generator. This MR handles that case.

Closes #1547

See merge request !592
2015-05-04 08:53:21 +00:00
..
assets Merge branch 'you-get-a-title-and-you-get-a-title-and-everyone-gets-a-title' into 'master' 2015-05-02 07:34:58 +00:00
controllers Merge branch 'fix-escaped-branches-in-compare' into 'master' 2015-05-04 06:58:56 +00:00
finders Group milestones by title in the dashboard and all other issue views 2015-05-01 01:12:58 +02:00
helpers Merge branch 'fix-wiki-search' into 'master' 2015-05-04 08:53:21 +00:00
mailers Make Reply-To config apply to change e-mail confirmation and other notifications 2015-05-01 22:57:10 -07:00
models Re-annotate models 2015-05-03 13:38:27 -07:00
services Revert "Added X-GitLab-Event header for web hooks" 2015-04-27 16:29:31 +03:00
uploaders
views Merge pull request #9234 from dsander/group-milestones-by-title 2015-05-03 14:29:31 +03:00
workers Revert "Added X-GitLab-Event header for web hooks" 2015-04-27 16:29:31 +03:00