diff options
| author | wycats <wycats@gmail.com> | 2010-03-28 11:06:46 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-28 11:06:46 -0700 |
| commit | c99194c7bed6744104e114ab231ef39158044a63 (patch) | |
| tree | 9566ad06335bf96d4c32e421c2d25b4676b3e0d3 /actionpack/lib/action_dispatch/routing | |
| parent | 835f5d0269a8d3615585119e77f1ba7d601c943b (diff) | |
| parent | f1e5a9ff982998c31c9dedf2fa79180c7dea820a (diff) | |
| download | rails-c99194c7bed6744104e114ab231ef39158044a63.tar.gz rails-c99194c7bed6744104e114ab231ef39158044a63.tar.bz2 rails-c99194c7bed6744104e114ab231ef39158044a63.zip | |
Merge remote branch 'rizwan/restrict'
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/deprecated_mapper.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb index dd650e83d9..b0545279b1 100644 --- a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb +++ b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/object/blank' + module ActionDispatch module Routing class RouteSet diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 5a3868e1d4..26f0e14e72 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/hash/except' +require 'active_support/core_ext/object/blank' module ActionDispatch module Routing |