diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-03-31 07:47:58 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-03-31 07:47:58 -0700 |
| commit | 824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8 (patch) | |
| tree | 1967c2a945d6e131d467fb4f0178a0f60e01ae8a /actionpack/lib/action_controller/deprecated | |
| parent | 1ed1652bef981d9402797b6cb9f0920a40eea21a (diff) | |
| parent | db28d407f76a790a31e27bf51560e23425dd6944 (diff) | |
| download | rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.tar.gz rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.tar.bz2 rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/deprecated')
| -rw-r--r-- | actionpack/lib/action_controller/deprecated/base.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/deprecated/base.rb b/actionpack/lib/action_controller/deprecated/base.rb index bbde570ca9..2fd60aacc7 100644 --- a/actionpack/lib/action_controller/deprecated/base.rb +++ b/actionpack/lib/action_controller/deprecated/base.rb @@ -66,6 +66,18 @@ module ActionController Rails.application.config.action_dispatch.ip_spoofing_check end + def cookie_verifier_secret=(value) + ActiveSupport::Deprecation.warn "ActionController::Base.cookie_verifier_secret= is deprecated. " << + "Please configure it on your application with config.cookie_secret=", caller + ActionController::Base.config.secret = value + end + + def cookie_verifier_secret + ActiveSupport::Deprecation.warn "ActionController::Base.cookie_verifier_secret is deprecated. " << + "Please use ActionController::Base.config.secret instead.", caller + ActionController::Base.config.secret + end + def trusted_proxies=(value) ActiveSupport::Deprecation.warn "ActionController::Base.trusted_proxies= is deprecated. " << "Please configure it on your application with config.action_dispatch.trusted_proxies=", caller |