diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-11-02 20:27:51 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-11-03 14:57:54 -0200 |
| commit | 4faa0418453055bc81456685d418d486252cc379 (patch) | |
| tree | acf0453393b953c6fd4c2145ef70ded6c9baeb05 /railties/lib/rails/application/configuration.rb | |
| parent | c2a7956eb7fbc099ea38d21601d215ab3def27fb (diff) | |
| download | rails-4faa0418453055bc81456685d418d486252cc379.tar.gz rails-4faa0418453055bc81456685d418d486252cc379.tar.bz2 rails-4faa0418453055bc81456685d418d486252cc379.zip | |
Rename secret_token_key to secret_key_base
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 0faa62c86c..f97e66985c 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -10,7 +10,7 @@ module Rails :cache_classes, :cache_store, :consider_all_requests_local, :console, :eager_load, :exceptions_app, :file_watcher, :filter_parameters, :force_ssl, :helpers_paths, :logger, :log_formatter, :log_tags, - :railties_order, :relative_url_root, :secret_token, :secret_token_key, + :railties_order, :relative_url_root, :secret_key_base, :secret_token, :serve_static_assets, :ssl_options, :static_cache_control, :session_options, :time_zone, :reload_classes_only_on_change, :queue, :queue_consumer, :beginning_of_week @@ -47,7 +47,7 @@ module Rails @queue_consumer = nil @eager_load = nil @secret_token = nil - @secret_token_key = nil + @secret_key_base = nil @assets = ActiveSupport::OrderedOptions.new @assets.enabled = false |