diff options
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb.tt | 3 |
2 files changed, 3 insertions, 3 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 68b2457af5..752f9df7d4 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -62,5 +62,8 @@ module <%= app_const_base %> # Enable IdentityMap for Active Record, to disable set to false or remove the line below. config.active_record.identity_map = true <% end -%> + + # Enable the asset pipeline + config.assets.enable = true end end diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb.tt deleted file mode 100644 index b26bdee39d..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_rails_defaults.rb.tt +++ /dev/null @@ -1,3 +0,0 @@ -<%= app_const %>.configure do - config.assets.enabled = true -end
\ No newline at end of file |