diff options
| author | José Valim <jose.valim@gmail.com> | 2012-06-10 11:38:37 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-06-10 11:38:37 +0200 |
| commit | 03f2249153ae4d2078646e6796d8b9e5ef747fba (patch) | |
| tree | 680e70837788456b717524fd2f046faa669e2ca0 /railties | |
| parent | 4845c0685aa3983b4685d4afe141ac5d398521bc (diff) | |
| download | rails-03f2249153ae4d2078646e6796d8b9e5ef747fba.tar.gz rails-03f2249153ae4d2078646e6796d8b9e5ef747fba.tar.bz2 rails-03f2249153ae4d2078646e6796d8b9e5ef747fba.zip | |
Use . instead of :: for class methods, add CHANGELOG entries
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | railties/test/application/configuration_test.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index a6abe5ee97..e19aa68407 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 4.0.0 (unreleased) ## +* Set `config.active_record.migration_error` to `:page_load` for development *Richard Schneeman* + * Add runner to Rails::Railtie as a hook called just after runner starts. *José Valim & kennyj* * Add `/rails/info/routes` path, displays same information as `rake routes` *Richard Schneeman & Andrew White* diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 75190372ab..7193dfdef5 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -49,7 +49,7 @@ module ApplicationTests RUBY require "#{app_path}/config/environment" - ActiveRecord::Migrator.stubs(:needs_migrations?).returns(true) + ActiveRecord::Migrator.stubs(:needs_migration?).returns(true) get "/foo" assert_equal 500, last_response.status |