diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-17 19:18:09 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-17 19:18:09 -0700 |
| commit | 0dfebbcd8ef05466e98e1b942970c3d9d11df6a2 (patch) | |
| tree | 14c5b56f117bc325a2cf1d6e3f474741023cec4a /railties | |
| parent | f4c6ecc17c45a9ce8b85c503f998675fbf5d6204 (diff) | |
| parent | 117d5e3bbb2d24a1bd4f6d5e18f6fed87c4dc344 (diff) | |
| download | rails-0dfebbcd8ef05466e98e1b942970c3d9d11df6a2.tar.gz rails-0dfebbcd8ef05466e98e1b942970c3d9d11df6a2.tar.bz2 rails-0dfebbcd8ef05466e98e1b942970c3d9d11df6a2.zip | |
Merge pull request #7968 from josh/only-precompile-app-assets-by-default
Only compile non-js/css under app/assets by default
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 2 |
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 = '' |