diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/environments/development.rb | 2 | ||||
| -rw-r--r-- | railties/environments/test.rb | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index e3e6801316..bec5b9164a 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added a 'whiny nil' that's aim to ensure that when users pass nil to methods where that isn't appropriate, instead of NoMethodError? and the name of some method used by the framework users will see a message explaining what type of object was expected. Only active in test and development environments by default #1209 [Michael Koziarski] + * Fixed the test_helper.rb to be safe for requiring controllers from multiple spots, like app/controllers/article_controller.rb and app/controllers/admin/article_controller.rb, without reloading the environment twice #1390 [Nicholas Seckar] * Fixed Webrick to escape + characters in URL's the same way that lighttpd and apache do #1397 [Nicholas Seckar] diff --git a/railties/environments/development.rb b/railties/environments/development.rb index d3681e28ca..aab4562a51 100644 --- a/railties/environments/development.rb +++ b/railties/environments/development.rb @@ -1,3 +1,5 @@ +require 'active_support/whiny_nil' + Dependencies.mechanism = :load ActionController::Base.consider_all_requests_local = true ActionController::Base.perform_caching = false diff --git a/railties/environments/test.rb b/railties/environments/test.rb index 8aa4c65af2..8c8746c4a0 100644 --- a/railties/environments/test.rb +++ b/railties/environments/test.rb @@ -1,3 +1,5 @@ +require 'active_support/whiny_nil' + Dependencies.mechanism = :require ActionController::Base.consider_all_requests_local = true ActionController::Base.perform_caching = false |