diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-08 21:06:26 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-08 21:06:26 +0100 |
| commit | 7942e909608f24db0365943c5d9ad51cbb4d27b5 (patch) | |
| tree | 6a9b51155b9220dbf98d4b1c78d8edccabd231c5 /actionpack/lib/action_controller/deprecated | |
| parent | 36eb1a686c831d5a14998bb9ac7cc60efa363373 (diff) | |
| parent | ae93789d9ad9095ca21784287464b760db12a095 (diff) | |
| download | rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.gz rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.bz2 rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.zip | |
Merge master.
Diffstat (limited to 'actionpack/lib/action_controller/deprecated')
| -rw-r--r-- | actionpack/lib/action_controller/deprecated/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/deprecated/base.rb b/actionpack/lib/action_controller/deprecated/base.rb index 34f8f4a822..1d05b3fbd6 100644 --- a/actionpack/lib/action_controller/deprecated/base.rb +++ b/actionpack/lib/action_controller/deprecated/base.rb @@ -57,7 +57,7 @@ module ActionController def ip_spoofing_check=(value) ActiveSupport::Deprecation.warn "ActionController::Base.ip_spoofing_check= is deprecated. " << "Please configure it on your application with config.action_dispatch.ip_spoofing_check=", caller - Rails.application.config.action_disaptch.ip_spoofing_check = value + Rails.application.config.action_dispatch.ip_spoofing_check = value end def ip_spoofing_check |