From 201f8d7753b594229a517e10a7181b15f3a33ffd Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sat, 5 Jan 2013 17:55:57 +0100
Subject: config.assets.enabled is now true by default

---
 railties/lib/rails/application/configuration.rb                  | 4 ++--
 .../rails/generators/rails/app/templates/config/application.rb   | 9 +++------
 .../rails/app/templates/config/environments/production.rb.tt     | 3 +++
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 086fd5ed95..2c7ddd86e7 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -48,12 +48,12 @@ module Rails
         @secret_key_base               = nil
 
         @assets = ActiveSupport::OrderedOptions.new
-        @assets.enabled                  = false
+        @assets.enabled                  = true
         @assets.paths                    = []
         @assets.precompile               = [ Proc.new { |path, fn| fn =~ /app\/assets/ && !%w(.js .css).include?(File.extname(path)) },
                                              /(?:\/|\\|\A)application\.(css|js)$/ ]
         @assets.prefix                   = "/assets"
-        @assets.version                  = ''
+        @assets.version                  = '1.0'
         @assets.debug                    = false
         @assets.compile                  = true
         @assets.digest                   = false
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 5f15c973c6..e459caa74e 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -31,12 +31,9 @@ module <%= app_const_base %>
     # like if you have constraints or database-specific column types.
     # config.active_record.schema_format = :sql
 
-<% unless options.skip_sprockets? -%>
-    # Enable the asset pipeline.
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets.
-    config.assets.version = '1.0'
+<% if options.skip_sprockets? -%>
+    # Disable the asset pipeline.
+    config.assets.enabled = false
 <% end -%>
   end
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index 68df1d1ec8..0ab91d9864 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -32,6 +32,9 @@
 
   # Generate digests for assets URLs.
   config.assets.digest = true
+
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
   <%- end -%>
 
   # Specifies the header that your server uses for sending files.
-- 
cgit v1.2.3