Merge branch 'master' into eager-url-helpers

* master:
  Remove force parent loading when counter cache child is created/destroyed
  Raise an error when loading all fixtures from nil fixture_path
  Revert "Remove `counter_cache_target` which is no longer called"
  Update counter cache in memory if parent target is existed
  If association is a hash-like object preloading fails
  Use the same option for create database statements between Raketask and travis.rb
  Fix "warning: shadowing outer local variable - config"
  Remove `counter_cache_target` which is no longer called
  Fix more offences
  Change the empty block style to have space inside of the block
  Fix a content_for test description
  Stringify database configurations
  Improve error message when assign wrong attributes to model

1 files changed, 2 insertions, 2 deletions

diff --git a/railties/lib/rails/test_unit/runner.rb b/railties/lib/rails/test_unit/runner.rb
index 6332a9d422..d38952bb30 100644
--- a/railties/lib/rails/test_unit/runner.rb
+++ b/railties/lib/rails/test_unit/runner.rb
@@ -12,8 +12,8 @@ module Rails
 
       class << self
         def attach_before_load_options(opts)
-          opts.on("--warnings", "-w", "Run with Ruby warnings enabled") {}
-          opts.on("-e", "--environment ENV", "Run tests in the ENV environment") {}
+          opts.on("--warnings", "-w", "Run with Ruby warnings enabled") { }
+          opts.on("-e", "--environment ENV", "Run tests in the ENV environment") { }
         end
 
         def parse_options(argv)