diff options
| author | Claudio B <claudiob@users.noreply.github.com> | 2015-12-24 06:17:28 -0800 |
|---|---|---|
| committer | Claudio B <claudiob@users.noreply.github.com> | 2015-12-24 06:17:28 -0800 |
| commit | 1e42a4dfb4ae8dd86729877dbc55adcbf947fa48 (patch) | |
| tree | 58ac26346e091e49944917359cf94ef154b2032d | |
| parent | fefd76e82af28decb895c22bbe1bbf265a2a8b75 (diff) | |
| parent | a92b3b4a4be23b85f878d2c0f1edf636636847c0 (diff) | |
| download | rails-1e42a4dfb4ae8dd86729877dbc55adcbf947fa48.tar.gz rails-1e42a4dfb4ae8dd86729877dbc55adcbf947fa48.tar.bz2 rails-1e42a4dfb4ae8dd86729877dbc55adcbf947fa48.zip | |
Merge pull request #22786 from jonatack/remove-whitespace
:scissors: whitespace in generated config files [skip ci]
2 files changed, 2 insertions, 2 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 40c831ec58..78f4530514 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,5 @@ # 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, +# 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. 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 43510c244b..0b718aa1c6 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,5 @@ # 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, +# 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. ActiveSupport.halt_callback_chains_on_return_false = false |