summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--capfile1
-rw-r--r--config/deploy.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/capfile b/capfile
index be29760e..ed4e2c09 100644
--- a/capfile
+++ b/capfile
@@ -1,4 +1,5 @@
load 'deploy' if respond_to?(:namespace) # cap2 differentiator
+load 'bundler/capistrano' # loads RVM's capistrano plugin
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
diff --git a/config/deploy.rb b/config/deploy.rb
index fb60bde8..33064ca5 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -2,7 +2,7 @@ $:.unshift(File.expand_path('./lib', ENV['rvm_path']))
require "rvm/capistrano"
set :rvm_ruby_string, 'ruby-1.9.2-p290@cakeside'
set :rvm_type, :system
-require 'bundler/capistrano' # loads RVM's capistrano plugin
+#require 'bundler/capistrano' # loads RVM's capistrano plugin
set :stages, %w(production staging)
set :default_stage, "staging"
require 'capistrano/ext/multistage'