diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-21 18:25:40 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-21 18:25:40 -0700 |
| commit | 2bf33bd4bcd488a35e641b32dd667f3092ea9197 (patch) | |
| tree | 79d7b708510f1329b003b585ade51f0da6a235c1 /railties/lib | |
| parent | 676ddfcf714c78024f75e37714e8eda484c3fad2 (diff) | |
| parent | 6e63e029b335b1a5dfce43c20de27ca6fae29fa4 (diff) | |
| download | rails-2bf33bd4bcd488a35e641b32dd667f3092ea9197.tar.gz rails-2bf33bd4bcd488a35e641b32dd667f3092ea9197.tar.bz2 rails-2bf33bd4bcd488a35e641b32dd667f3092ea9197.zip | |
Merge pull request #3027 from alex3/assets-precompile-regex-fix
Default precompile regex was erroneously matching files
Diffstat (limited to 'railties/lib')
| -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 a48db3b6d2..141b39fb4b 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -38,7 +38,7 @@ module Rails @assets.enabled = false @assets.paths = [] @assets.precompile = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) }, - /application.(css|js)$/ ] + /(?:\/|\\|\A)application\.(css|js)$/ ] @assets.prefix = "/assets" @assets.version = '' @assets.debug = false |