From 27a8b233723f91648a5696617d321a04d1ad21cd Mon Sep 17 00:00:00 2001 From: Junv Zhao Date: Sat, 28 Nov 2015 11:35:55 +0800 Subject: [PATCH] =?UTF-8?q?revert=20to=20rvm=20=F0=9F=98=82=20Face=20with?= =?UTF-8?q?=20tears=20of=20joy=20Unicode:=20U+1F602,=20UTF-8:=20F0=209F=20?= =?UTF-8?q?98=2082?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Capfile | 2 +- Gemfile | 2 +- config/deploy.rb | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Capfile b/Capfile index b22f39e..877cd59 100644 --- a/Capfile +++ b/Capfile @@ -24,8 +24,8 @@ require 'capistrano/deploy' # require 'capistrano/passenger' require 'capistrano/rails' -require 'capistrano/rbenv' require 'capistrano/bundler' +require 'capistrano/rvm' require 'capistrano/puma' require 'capistrano/sidekiq' require 'capistrano/sidekiq/monit' diff --git a/Gemfile b/Gemfile index 16d3b59..b9f4556 100644 --- a/Gemfile +++ b/Gemfile @@ -92,7 +92,7 @@ group :development do gem 'capistrano-bundler', require: false gem 'capistrano3-puma', require: false gem 'capistrano-sidekiq' - gem 'capistrano-rbenv', '~> 2.0' + gem 'rvm1-capistrano3', require: false end group :development, :test do diff --git a/config/deploy.rb b/config/deploy.rb index 2661ab4..abcecd3 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -10,7 +10,6 @@ set :repo_url, 'git@github.com:Librcn/Libr.git' set :user, 'deployer' set :puma_threads, [4, 16] set :puma_workers, 0 -set :rbenv_ruby, '2.2.3' # Don't change these unless you know what you're doing # set :pty, true