diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-01-15 03:30:42 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-01-15 03:30:42 -0200 |
| commit | b2874aec105c277b6008cb8d73ffd106a12b444b (patch) | |
| tree | da2ee3ea92eb7e74547441c72e0f5273ae354d1e /railties/lib | |
| parent | 06c33f22e008316ac56993e80aa389e12a3309e4 (diff) | |
| parent | 9b52e447a6ba152337e0aa22fddb4fbb7f2d485e (diff) | |
| download | rails-b2874aec105c277b6008cb8d73ffd106a12b444b.tar.gz rails-b2874aec105c277b6008cb8d73ffd106a12b444b.tar.bz2 rails-b2874aec105c277b6008cb8d73ffd106a12b444b.zip | |
Merge pull request #23014 from jonatack/improve-generated-config-files
Improve generated config initializer files
Diffstat (limited to 'railties/lib')
2 files changed, 6 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/active_record_belongs_to_required_by_default.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/active_record_belongs_to_required_by_default.rb index 78f4530514..f613b40f80 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/active_record_belongs_to_required_by_default.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/active_record_belongs_to_required_by_default.rb @@ -1,5 +1,6 @@ # Be sure to restart your server when you modify this file. -# Require `belongs_to` associations by default. This is a new Rails 5.0 default, -# so introduced as a config to ensure apps made with earlier versions of Rails aren't affected when upgrading. +# Require `belongs_to` associations by default. This is a new Rails 5.0 +# default, so it is introduced as a configuration option to ensure that apps +# made on earlier versions of Rails are not affected when upgrading. Rails.application.config.active_record.belongs_to_required_by_default = true diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/callback_terminator.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/callback_terminator.rb index 0b718aa1c6..649e82280e 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/callback_terminator.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/callback_terminator.rb @@ -1,5 +1,6 @@ # Be sure to restart your server when you modify this file. -# Do not halt callback chains when a callback returns false. This is a new Rails 5.0 default, -# so introduced as a config to ensure apps made with earlier versions of Rails aren't affected when upgrading. +# Do not halt callback chains when a callback returns false. This is a new +# Rails 5.0 default, so it is introduced as a configuration option to ensure +# that apps made with earlier versions of Rails are not affected when upgrading. ActiveSupport.halt_callback_chains_on_return_false = false |