diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-07-14 08:43:40 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-07-14 08:43:40 +0100 |
| commit | bb790631de2973f8009af558cc9d9a6a70a6efc9 (patch) | |
| tree | f8b4eea6246690b724a45adb522d45e1c6708b55 /config/routes.rb | |
| parent | 13885a4933e7ac4c9e54116dc216e2132ada77da (diff) | |
| parent | 4f3f88db01057af00db2796cd5a996e7f69fc8cd (diff) | |
Merge branch 'master' of github.com:sebbacon/alaveteli
Conflicts:
app/views/request/_request_listing_single.rhtml
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb index ec0e24f67..175a37a82 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,7 +17,7 @@ ActionController::Routing::Routes.draw do |map| map.with_options :controller => 'general' do |general| general.frontpage '/', :action => 'frontpage' general.blog '/blog', :action => 'blog' - general.custom_css '/stylesheets/custom.css', :action => 'custom_css' + general.custom_css '/stylesheets/custom.css', :action => 'custom_css' general.search_redirect '/search', :action => 'search_redirect' # XXX combined is the search query, and then if sorted a "/newest" at the end. # Couldn't find a way to do this in routes which also picked up multiple other slashes @@ -114,8 +114,8 @@ ActionController::Routing::Routes.draw do |map| help.help_officers '/help/officers', :action => 'officers' help.help_requesting '/help/requesting', :action => 'requesting' help.help_privacy '/help/privacy', :action => 'privacy' - help.help_api '/help/api', :action => 'api' - help.help_credits '/help/credits', :action => 'credits' + help.help_api '/help/api', :action => 'api' + help.help_credits '/help/credits', :action => 'credits' help.help_general '/help/:action', :action => :action end |