diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-09 13:07:30 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-09 13:07:30 -0300 |
| commit | 6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5 (patch) | |
| tree | c169325ddd18aedd18c66f22a53ba04190a0a41e /railties/lib | |
| parent | 8885b2d6c1855742600d0afdb9dfc002acb62e5e (diff) | |
| parent | 8ee0c598dbe3f9fd133e85c69c6e43f62056646c (diff) | |
| download | rails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.tar.gz rails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.tar.bz2 rails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/initializer.rb | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/gems.rake | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 71366a4480..9d27488e8a 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -462,7 +462,7 @@ Run `rake gems:install` to install the missing gems. if RAILS_CACHE.respond_to?(:middleware) # Insert middleware to setup and teardown local cache for each request - configuration.middleware.insert_after(:"ActionController::Failsafe", RAILS_CACHE.middleware) + configuration.middleware.insert_after(:"ActionDispatch::Failsafe", RAILS_CACHE.middleware) end end end diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake index efadb1da3b..7cf7061f38 100644 --- a/railties/lib/tasks/gems.rake +++ b/railties/lib/tasks/gems.rake @@ -27,8 +27,7 @@ namespace :gems do desc "Force the build of all gems" task :force do $gems_build_rake_task = true - Rake::Task['gems:unpack'].invoke - current_gems.each { |gem| gem.build(:force => true) } + frozen_gems.each { |gem| gem.build(:force => true) } end end |