From 3c5663f3e7c5cf528d5f02016e948f17f1d4a9f4 Mon Sep 17 00:00:00 2001 From: Junv Zhao Date: Sat, 28 Nov 2015 19:47:07 +0800 Subject: [PATCH] ruby version fix --- Gemfile | 2 -- Gemfile.lock | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index b9f4556..2aaa712 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,5 @@ source 'https://rubygems.org' -ruby '2.2.3' - # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.3' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 41f295e..600475f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,9 +94,6 @@ GEM capistrano-rails (1.1.5) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano-rbenv (2.0.3) - capistrano (~> 3.1) - sshkit (~> 1.3) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) @@ -330,6 +327,9 @@ GEM sidekiq (>= 2.4.0) rspec-support (3.3.0) ruby-hmac (0.4.0) + rvm1-capistrano3 (1.4.0) + capistrano (~> 3.0) + sshkit (>= 1.2) sass (3.4.19) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) @@ -415,7 +415,6 @@ DEPENDENCIES capistrano capistrano-bundler capistrano-rails - capistrano-rbenv (~> 2.0) capistrano-rvm capistrano-sidekiq capistrano3-puma @@ -448,6 +447,7 @@ DEPENDENCIES rest-client rspec-rails (~> 3.0) rspec-sidekiq + rvm1-capistrano3 sass-rails (~> 5.0) sdoc (~> 0.4.0) sentry-raven