diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2011-05-18 20:53:39 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2011-05-18 23:19:13 +0900 |
| commit | 32b9cefb637741ac7158085790cda56360a229f2 (patch) | |
| tree | 441c6f21edb1f55ffb80ecb633c7456cee5bdc3a /railties/lib/rails | |
| parent | 9aa10a79f93fb5011a7f2eac282c75d157c5d08d (diff) | |
| download | rails-32b9cefb637741ac7158085790cda56360a229f2.tar.gz rails-32b9cefb637741ac7158085790cda56360a229f2.tar.bz2 rails-32b9cefb637741ac7158085790cda56360a229f2.zip | |
parenthesize the arguments with splat
to make sure we're not calling the :* operator
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/engine.rb | 6 | ||||
| -rw-r--r-- | railties/lib/rails/generators/actions.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 6a125685d0..e26f73ed8d 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -522,9 +522,9 @@ module Rails end initializer :append_assets_path do |app| - app.config.assets.paths.unshift *paths["vendor/assets"].existent - app.config.assets.paths.unshift *paths["lib/assets"].existent - app.config.assets.paths.unshift *paths["app/assets"].existent + app.config.assets.paths.unshift(*paths["vendor/assets"].existent) + app.config.assets.paths.unshift(*paths["lib/assets"].existent) + app.config.assets.paths.unshift(*paths["app/assets"].existent) end initializer :prepend_helpers_path do |app| diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb index c323df3e95..d31a3262e3 100644 --- a/railties/lib/rails/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb @@ -278,7 +278,7 @@ module Rails say args.first.to_s unless options.quiet? else args << (self.behavior == :invoke ? :green : :red) - say_status *args + say_status(*args) end end |