Merge pull request #7968 from josh/only-precompile-app-assets-by-default

Only compile non-js/css under app/assets by default
rails · Oct 18, 2012 · 0dfebbc · 0dfebbc
2 parents f4c6ecc + 117d5e3
commit 0dfebbc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
@@ -50,7 +50,7 @@ def initialize(*)
         @assets = ActiveSupport::OrderedOptions.new
         @assets.enabled                  = false
         @assets.paths                    = []
-        @assets.precompile               = [ Proc.new { |path| !%w(.js .css).include?(File.extname(path)) },
+        @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                  = ''