Merge pull request rails#22786 from jonatack/remove-whitespace

✂️ whitespace in generated config files [skip ci]
Mihoid · Dec 24, 2015 · 1e42a4d · 1e42a4d
2 parents fefd76e + a92b3b4
commit 1e42a4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...s/rails/app/templates/config/initializers/active_record_belongs_to_required_by_default.rb b/...s/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
@@ -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