Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 805768a67cac0be9ef84921309c5321fd358631c 1 parent 57fd6ba
Guillermo Iguaran guilleiguaran authored
5 railties/lib/rails/generators/rails/app/templates/config/application.rb
View
@@ -28,10 +28,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
1  railties/test/generators/app_generator_test.rb
View
@@ -226,7 +226,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)
Please sign in to comment.
Something went wrong with that request. Please try again.