diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-09 21:56:28 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-09 21:56:28 -0700 |
| commit | be24be62b60c9cf6ca79aa7d20cabe6f3691e0c3 (patch) | |
| tree | 1494570dd262026b7a521e5f24b0a8d0d561954a /actionpack | |
| parent | f43ffdcb9677d4fbe03ccd83a4c427b57ccd15f0 (diff) | |
| parent | 901c02d86a1e2cccc8cc2c6ea9ec3f68a6c72607 (diff) | |
| download | rails-be24be62b60c9cf6ca79aa7d20cabe6f3691e0c3.tar.gz rails-be24be62b60c9cf6ca79aa7d20cabe6f3691e0c3.tar.bz2 rails-be24be62b60c9cf6ca79aa7d20cabe6f3691e0c3.zip | |
Merge pull request #2876 from alex3/patch-1
Fixed assets precompile regex
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/sprockets/assets.rake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake index a8128d9a82..893ecf58fe 100644 --- a/actionpack/lib/sprockets/assets.rake +++ b/actionpack/lib/sprockets/assets.rake @@ -26,6 +26,8 @@ namespace :assets do env.each_logical_path do |logical_path| if path.is_a?(Regexp) next unless path.match(logical_path) + elsif path.is_a?(Proc) + next unless path.call(logical_path) else next unless File.fnmatch(path.to_s, logical_path) end |