diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-21 23:41:18 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-21 23:41:18 -0800 |
| commit | 432c3661512389986349a1f4ba2b92362117cc30 (patch) | |
| tree | abacaeda2bf35d7ddc8700508b3ed79848370ee5 /railties | |
| parent | 667d7aa61d0c50be23ab24a4c16b8c9c9c0daff8 (diff) | |
| parent | 4f6af26a886630c97865a2e5023a9560692e6aa4 (diff) | |
| download | rails-432c3661512389986349a1f4ba2b92362117cc30.tar.gz rails-432c3661512389986349a1f4ba2b92362117cc30.tar.bz2 rails-432c3661512389986349a1f4ba2b92362117cc30.zip | |
Merge pull request #4121 from lest/remove-whiny-nils
remove AS whiny nil extension and deprecate config.whiny_nils
Diffstat (limited to 'railties')
3 files changed, 6 insertions, 7 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index a782441a21..d14cf737d9 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -12,7 +12,7 @@ module Rails :force_ssl, :helpers_paths, :logger, :log_tags, :preload_frameworks, :railties_order, :relative_url_root, :reload_plugins, :secret_token, :serve_static_assets, :ssl_options, :static_cache_control, :session_options, - :time_zone, :reload_classes_only_on_change, :whiny_nils + :time_zone, :reload_classes_only_on_change attr_writer :log_level attr_reader :encoding @@ -145,6 +145,11 @@ module Rails @session_options = args.shift || {} end end + + def whiny_nils=(*) + ActiveSupport::Deprecation.warn "config.whiny_nils option " \ + "is deprecated and no longer works", caller + end end end end diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt index 9e53b6a70d..a1d41fd7dd 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt @@ -6,9 +6,6 @@ # since you don't have to restart the web server when you make code changes. config.cache_classes = false - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - # Show full error reports and disable caching config.consider_all_requests_local = true config.action_controller.perform_caching = false diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt index 37a8b81dad..86016da189 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt @@ -11,9 +11,6 @@ config.serve_static_assets = true config.static_cache_control = "public, max-age=3600" - # Log error messages when you accidentally call methods on nil - config.whiny_nils = true - # Show full error reports and disable caching config.consider_all_requests_local = true config.action_controller.perform_caching = false |