diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-01 02:15:50 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-01 02:18:35 -0500 |
| commit | d30cf963ebd4c0d74353dcbd9b8061f58b1d32cd (patch) | |
| tree | 4e0cb8abdf583a80da1764d26fcc13dbe3c48626 /railties | |
| parent | e898baa55357976ae600dca19a220f8edf3cb356 (diff) | |
| download | rails-d30cf963ebd4c0d74353dcbd9b8061f58b1d32cd.tar.gz rails-d30cf963ebd4c0d74353dcbd9b8061f58b1d32cd.tar.bz2 rails-d30cf963ebd4c0d74353dcbd9b8061f58b1d32cd.zip | |
config.assets.enabled isn't used anymore to disable Rails asset pipeline
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 5 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index a8cff606b1..16fe50bab8 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -30,10 +30,5 @@ module <%= app_const_base %> # 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 diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index f89ff66e3e..257d07f514 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -291,7 +291,6 @@ class AppGeneratorTest < Rails::Generators::TestCase 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) |