diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-06 17:11:47 -0800 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-06 17:11:47 -0800 |
| commit | fc770ee6eb342d4562b6588612f1c9aca46f58e1 (patch) | |
| tree | 8833be60c0f0cb39d33dbaf4538ceca8d848e57f /config/routes.rb | |
| parent | 455a1f07f3099d1d94fff2a7efcf99fb8fd6841d (diff) | |
| parent | 7abb45b0549af892b7f1ec2beeca5a42f8c2ef7a (diff) | |
Merge remote-tracking branch 'openaustralia_github/make-links-relative' into develop
Conflicts:
app/controllers/admin_request_controller.rb
app/models/request_mailer.rb
app/views/admin_general/index.rhtml
app/views/admin_general/stats.rhtml
app/views/admin_public_body/_one_list.rhtml
app/views/admin_public_body/_tags.rhtml
app/views/admin_public_body/show.rhtml
app/views/admin_request/show.rhtml
app/views/admin_user/show.rhtml
app/views/layouts/admin.rhtml
app/views/public_body/show.rhtml
app/views/request/new.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 c0e79f2cd..e95405c1e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -161,9 +161,9 @@ ActionController::Routing::Routes.draw do |map| end map.with_options :controller => 'request_game' do |game| - game.play '/categorise/play', :action => 'play' - game.request '/categorise/request/:url_title', :action => 'show' - game.stop '/categorise/stop', :action => 'stop' + game.categorise_play '/categorise/play', :action => 'play' + game.categorise_request '/categorise/request/:url_title', :action => 'show' + game.categorise_stop '/categorise/stop', :action => 'stop' end map.with_options :controller => 'admin_public_body' do |body| |