diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-13 18:02:49 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-13 18:02:49 +0200 |
| commit | 26528efb54ac781ea71901d2b24e07e95d8ed4d4 (patch) | |
| tree | d372ab9d2f43795c101631708dd6b72c3fd70613 /railties/lib/rails | |
| parent | 4eb3ee4818b82762320444ec8c804d4e23eef43b (diff) | |
| download | rails-26528efb54ac781ea71901d2b24e07e95d8ed4d4.tar.gz rails-26528efb54ac781ea71901d2b24e07e95d8ed4d4.tar.bz2 rails-26528efb54ac781ea71901d2b24e07e95d8ed4d4.zip | |
Blah, assets cant be turned on from initializers either
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 |