diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-06 15:38:05 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-06 15:38:05 -0700 |
| commit | 4c4fd1a60ff1c060e76e9ee540074756510f53ea (patch) | |
| tree | 77da1c66c127e36c8b00825b676d9267a9ef4cd6 /railties/lib/rails/configuration.rb | |
| parent | 03cb74b9461293b96ae0add8ff5efda132dabba0 (diff) | |
| parent | af130575249571464ec984efa84fcea1267e8cf8 (diff) | |
| download | rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.tar.gz rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.tar.bz2 rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'railties/lib/rails/configuration.rb')
| -rw-r--r-- | railties/lib/rails/configuration.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index 73ae9bcb16..dfd849b4bb 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -104,6 +104,18 @@ module Rails "please do paths.app.controllers instead", caller paths.app.controllers.to_a.uniq end + + def cookie_secret=(value) + ActiveSupport::Deprecation.warn "config.cookie_secret= is deprecated, " << + "please use config.secret_token= instead", caller + self.secret_token = value + end + + def cookie_secret + ActiveSupport::Deprecation.warn "config.cookie_secret is deprecated, " << + "please use config.secret_token instead", caller + self.secret_token + end end end end |