Commit b1c499e2
Changed files (2)
config
config/deploy.rb
@@ -17,6 +17,6 @@ set :deploy_env, 'production'
$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
require "rvm/capistrano"
-require 'bundler/capistrano' # loads RVM's capistrano plugin
-set :rvm_ruby_string, '1.9.2-p290@cakeside'
+#require 'bundler/capistrano' # loads RVM's capistrano plugin
+set :rvm_ruby_string, 'ruby-1.9.2-p290@cakeside'
set :rvm_type, :system
Gemfile.lock
@@ -88,7 +88,7 @@ GEM
exception_notification (2.6.1)
actionmailer (>= 3.0.4)
excon (0.13.4)
- execjs (1.3.0)
+ execjs (1.3.1)
multi_json (~> 1.0)
factory_girl (3.2.0)
activesupport (>= 3.0.0)
@@ -139,7 +139,7 @@ GEM
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.6.6)
+ json (1.7.0)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -216,7 +216,7 @@ GEM
rspec (~> 2.9.0)
ruby-hmac (0.4.0)
ruby_gntp (0.3.4)
- rubyzip (0.9.7)
+ rubyzip (0.9.8)
sass (3.1.16)
sass-rails (3.2.5)
railties (~> 3.2.0)
@@ -228,7 +228,7 @@ GEM
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- sprockets (2.1.2)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)