Permalink
Browse files

config.assets.enabled isn't used anymore to disable Rails asset pipeline

  • Loading branch information...
1 parent e898baa commit d30cf963ebd4c0d74353dcbd9b8061f58b1d32cd @guilleiguaran guilleiguaran committed Dec 1, 2013
@@ -30,10 +30,5 @@ class Application < Rails::Application
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
-<% if options.skip_sprockets? -%>
-
- # Disable the asset pipeline.
- config.assets.enabled = false
-<% end -%>
end
end
@@ -291,7 +291,6 @@ def test_generator_if_skip_sprockets_is_given
run_generator [destination_root, "--skip-sprockets"]
assert_file "config/application.rb" do |content|
assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content)
- assert_match(/config\.assets\.enabled = false/, content)
end
assert_file "Gemfile" do |content|
assert_no_match(/sass-rails/, content)

0 comments on commit d30cf96

Please sign in to comment.