Permalink
Browse files

fix deploy for 3.2.1

  • Loading branch information...
1 parent 84af28b commit 38ce6ccc26b2c37e16b14d38dbd75ceaee41e9a0 @piotrmasior committed Apr 15, 2012
Showing with 6 additions and 6 deletions.
  1. +4 −2 Capfile
  2. +2 −4 config/deploy.rb
View
@@ -1,2 +1,4 @@
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+load 'deploy'
+load 'deploy/assets'
+Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+load 'config/deploy' # remove this line to skip loading any of the default tasks
View
@@ -1,3 +1,5 @@
+require 'bundler/capistrano'
+require 'capistrano/ext/multistage'
# Add RVM's lib directory to the load path.
$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
@@ -6,10 +8,6 @@
set :rvm_ruby_string, '1.9.3@lethal'
-require 'capistrano/ext/multistage'
-require 'bundler/capistrano'
-load 'deploy/assets'
-
set :stages, %w(production)
set :default_stage, "production"
ssh_options[:forward_agent] = true

0 comments on commit 38ce6cc

Please sign in to comment.