diff --git a/Gemfile.lock b/Gemfile.lock index d47fb3c6..30901eae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -136,7 +136,6 @@ GEM less-rails (2.2.6) actionpack (>= 3.1) less (~> 2.2.0) - libv8 (3.3.10.4) libwebsocket (0.1.7.1) addressable websocket @@ -190,6 +189,7 @@ GEM rb-fsevent (0.9.2) rdoc (3.12) json (~> 1.4) + ref (1.0.2) rest-client (1.6.7) mime-types (>= 1.16) rqrcode (0.4.2) @@ -241,8 +241,8 @@ GEM rspec-rails (>= 2.5.0) subexec (0.2.2) temple (0.5.5) - therubyracer (0.10.2) - libv8 (~> 3.3.10) + therubyracer (0.11.0) + ref thin (1.5.0) daemons (>= 1.0.9) eventmachine (>= 0.12.6) diff --git a/config/deploy.rb b/config/deploy.rb index 787b56e7..b7c83042 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,6 +1,6 @@ #$:.unshift(File.expand_path('./lib', ENV['rvm_path'])) require "bundler/capistrano" -load 'deploy/assets' +#load 'deploy/assets' # Load RVM's capistrano plugin. #require "rvm/capistrano"