aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-24 14:18:01 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-24 18:18:30 -0300
commitd54ff41f8e0588df0d6e2f48554f62e1176a873e (patch)
treef672d8faa5b1f4638995a223169726c900694e87 /actionpack/lib
parent3de95fd9303ea2a2ffa5184f8cf32db63cb7f4ac (diff)
downloadrails-d54ff41f8e0588df0d6e2f48554f62e1176a873e.tar.gz
rails-d54ff41f8e0588df0d6e2f48554f62e1176a873e.tar.bz2
rails-d54ff41f8e0588df0d6e2f48554f62e1176a873e.zip
Merge pull request #3121 from cablegram/3-1-stable
Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so it works on Windows
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/sprockets/assets.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 12b954371a..7764bd401a 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -6,7 +6,7 @@ namespace :assets do
if ENV["RAILS_GROUPS"].to_s.empty? || ENV["RAILS_ENV"].to_s.empty?
ENV["RAILS_GROUPS"] ||= "assets"
ENV["RAILS_ENV"] ||= "production"
- Kernel.exec $0, *ARGV
+ ruby $0, *ARGV
else
require "fileutils"
Rake::Task["tmp:cache:clear"].invoke