kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Warnings removed when running with 1.9.3

Browse source
This commit is contained in:
Arun Agrawal 2011-10-09 17:15:55 +05:30
parent 2ed66feae0
commit ca219a21b6
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/sprockets/assets.rake
View file

@ -6,7 +6,7 @@ namespace :assets do
groups = ENV['RAILS_GROUPS'] || 'assets' groups = ENV['RAILS_GROUPS'] || 'assets'
args = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"] args = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"]
args << "--trace" if Rake.application.options.trace args << "--trace" if Rake.application.options.trace
ruby *args ruby(*args)
end end
# We are currently running with no explicit bundler group # We are currently running with no explicit bundler group

2
railties/lib/rails/generators/resource_helpers.rb
View file

@ -65,7 +65,7 @@ module Rails
begin begin
"#{options[:orm].to_s.classify}::Generators::ActiveModel".constantize "#{options[:orm].to_s.classify}::Generators::ActiveModel".constantize
rescue NameError => e rescue NameError
Rails::Generators::ActiveModel Rails::Generators::ActiveModel
end end
end end

2
railties/test/generators/assets_generator_test.rb
View file

@ -13,7 +13,7 @@ class AssetsGeneratorTest < Rails::Generators::TestCase
end end
def test_skipping_assets 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/javascripts/posts.js"
assert_no_file "app/assets/stylesheets/posts.css" assert_no_file "app/assets/stylesheets/posts.css"
end end