Commit 5144955d

@@ -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'
@@ -18,8 +18,9 @@ set :deploy_to, "/home/cakeside/apps/#{application}"
 set :scm, :git
 set :repository,  "git@cakeartist.unfuddle.com:cakeartist/cake.git"
 set :keep_releases, 3
+set :branch, "master"
 set :deploy_env, 'production'
-#set :scm_verbose, true
+set :scm_verbose, true
 
 # ugly workaround for bug https://github.com/capistrano/capistrano/issues/81
 before "deploy:assets:precompile", "bundle:install"

@@ -1,5 +1,4 @@
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-#require '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

@@ -88,7 +88,7 @@ GEM
     exception_notification (2.6.1)
       actionmailer (>= 3.0.4)
     excon (0.13.4)
-    execjs (1.3.1)
+    execjs (1.3.2)
       multi_json (~> 1.0)
     factory_girl (3.2.0)
       activesupport (>= 3.0.0)
@@ -139,7 +139,7 @@ GEM
     jquery-rails (2.0.2)
       railties (< 5.0, >= 3.2.0)
       thor (~> 0.14)
-    json (1.7.0)
+    json (1.7.1)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)