From 7241498e51120b9847a8bc16cf48551db0f3e216 Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@seantheprogrammer.com>
Date: Wed, 16 Dec 2015 09:43:32 -0700
Subject: Require a version of bcrypt that works on Windows when needed

bcrypt 3.1.0 doesn't load on Windows. See
https://github.com/codahale/bcrypt-ruby/issues/128
for details.
---
 Gemfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index 46c98ce4bb..034f87748e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,11 @@ gem 'sass-rails', github: 'rails/sass-rails', branch: 'master'
 # require: false so bcrypt is loaded only when has_secure_password is used.
 # This is to avoid Active Model (and by extension the entire framework)
 # being dependent on a binary library.
-gem 'bcrypt', '~> 3.1.10', require: false
+if Bundler::WINDOWS
+  gem 'bcrypt-ruby', '~> 3.0.0', require: false
+else
+  gem 'bcrypt', '~> 3.1.10', require: false
+end
 
 # This needs to be with require false to avoid it being automatically loaded by
 # sprockets.
-- 
cgit v1.2.3