diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-10-09 07:34:56 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-10-09 07:34:56 -0700 |
| commit | 1774ec7464877cfb2e0900344deff17c78bc491f (patch) | |
| tree | 8185334baf7d75b9436863cf1078ba6cd38fdfc0 | |
| parent | 2ed66feae0e04c5ab5445fe3a9d7b182b10f6f1a (diff) | |
| parent | ca219a21b60ea20868deab20afaa0335d32f1c17 (diff) | |
| download | rails-1774ec7464877cfb2e0900344deff17c78bc491f.tar.gz rails-1774ec7464877cfb2e0900344deff17c78bc491f.tar.bz2 rails-1774ec7464877cfb2e0900344deff17c78bc491f.zip | |
Merge pull request #3266 from arunagw/warnings_removed
Warnings removed when running with 1.9.3
| -rw-r--r-- | actionpack/lib/sprockets/assets.rake | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/resource_helpers.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/assets_generator_test.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake index a5145080c2..a61a121d55 100644 --- a/actionpack/lib/sprockets/assets.rake +++ b/actionpack/lib/sprockets/assets.rake @@ -6,7 +6,7 @@ namespace :assets do groups = ENV['RAILS_GROUPS'] || 'assets' args = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"] args << "--trace" if Rake.application.options.trace - ruby *args + ruby(*args) end # We are currently running with no explicit bundler group diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb index de01c858dd..b34bc4a524 100644 --- a/railties/lib/rails/generators/resource_helpers.rb +++ b/railties/lib/rails/generators/resource_helpers.rb @@ -65,7 +65,7 @@ module Rails begin "#{options[:orm].to_s.classify}::Generators::ActiveModel".constantize - rescue NameError => e + rescue NameError Rails::Generators::ActiveModel end end diff --git a/railties/test/generators/assets_generator_test.rb b/railties/test/generators/assets_generator_test.rb index 044e0b6bc6..d6338bd3da 100644 --- a/railties/test/generators/assets_generator_test.rb +++ b/railties/test/generators/assets_generator_test.rb @@ -13,7 +13,7 @@ class AssetsGeneratorTest < Rails::Generators::TestCase end def test_skipping_assets - content = run_generator ["posts", "--no-stylesheets", "--no-javascripts"] + run_generator ["posts", "--no-stylesheets", "--no-javascripts"] assert_no_file "app/assets/javascripts/posts.js" assert_no_file "app/assets/stylesheets/posts.css" end |