aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2012-10-16 14:17:41 -0500
committerJoshua Peek <josh@joshpeek.com>2012-10-16 14:17:41 -0500
commit117d5e3bbb2d24a1bd4f6d5e18f6fed87c4dc344 (patch)
tree218c8e2ba397f6aaaadceba8224f7f5ab9773c5a /railties/lib
parent4f4417314c9f1e81bc7a11b569d85ace1f8384f8 (diff)
downloadrails-117d5e3bbb2d24a1bd4f6d5e18f6fed87c4dc344.tar.gz
rails-117d5e3bbb2d24a1bd4f6d5e18f6fed87c4dc344.tar.bz2
rails-117d5e3bbb2d24a1bd4f6d5e18f6fed87c4dc344.zip
Only compile non-js/css under app/assets by default
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application/configuration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 9ada195dd3..7df517de71 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -50,7 +50,7 @@ module Rails
@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 = ''