From 33ecdfe97b5b341f612fd4d1ecbb8e4a0f3b2200 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Sun, 19 Apr 2015 15:54:09 -0500 Subject: [PATCH] Downgrade version of bcrypt for travis --- Gemfile | 2 +- Gemfile.lock | 7 +++---- gemfiles/rails-4.2.edge.gemfile | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 8f6eb805..b81b6264 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'bcrypt-ruby', '~> 3.1.5' +gem 'bcrypt-ruby', '~> 3.0.1' gem 'rails', '4.1.0' gem 'jquery-rails' gem 'sass-rails', '~> 4.0.3', require: 'sass' diff --git a/Gemfile.lock b/Gemfile.lock index 36296ca2..309083e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,9 +36,8 @@ GEM aws-sdk-v1 (1.64.0) json (~> 1.4) nokogiri (>= 1.4.4) - bcrypt (3.1.10-x86-mingw32) - bcrypt-ruby (3.1.5-x86-mingw32) - bcrypt (>= 3.1.3) + bcrypt-ruby (3.0.1) + bcrypt-ruby (3.0.1-x86-mingw32) bootplus-rails (1.0.0) builder (3.2.2) capybara (2.4.4) @@ -212,7 +211,7 @@ PLATFORMS DEPENDENCIES aws-sdk (~> 1.50) - bcrypt-ruby (~> 3.1.5) + bcrypt-ruby (~> 3.0.1) bootplus-rails capybara coffee-rails (~> 4.0.0) diff --git a/gemfiles/rails-4.2.edge.gemfile b/gemfiles/rails-4.2.edge.gemfile index dfa1e74e..3a68d6d0 100644 --- a/gemfiles/rails-4.2.edge.gemfile +++ b/gemfiles/rails-4.2.edge.gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' source 'https://rubygems.org' -gem 'bcrypt', '~> 3.1.7' +gem 'bcrypt-ruby', '~> 3.0.1' gem 'rails', '4.1.0' gem 'jquery-rails' gem 'sass-rails', '~> 4.0.3', :require => 'sass'