diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-06-04 11:05:46 +1200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-06-04 11:05:46 +1200 |
| commit | e3c26e9926948587efcc8d31c729395093407df6 (patch) | |
| tree | 358f418791a56620c32a48776739b4fdf39d3cb0 /actionpack/lib/action_controller/routing.rb | |
| parent | b9a9b91a3e3b892ab72ff5c618181747d6b4be04 (diff) | |
| parent | 8afa725f4b98a6e0ceee4792e8ebaebb6189e5f6 (diff) | |
| download | rails-e3c26e9926948587efcc8d31c729395093407df6.tar.gz rails-e3c26e9926948587efcc8d31c729395093407df6.tar.bz2 rails-e3c26e9926948587efcc8d31c729395093407df6.zip | |
Merge branch 'master' into patches
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 6aa266513d..8846dcc504 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -369,7 +369,7 @@ module ActionController Routes = RouteSet.new - ::Inflector.module_eval do + ActiveSupport::Inflector.module_eval do # Ensures that routes are reloaded when Rails inflections are updated. def inflections_with_route_reloading(&block) returning(inflections_without_route_reloading(&block)) { |