From efbfdd4049aa1101783d944199442e57081c4482 Mon Sep 17 00:00:00 2001 From: "T.J. Schuck" Date: Thu, 10 Mar 2016 14:13:21 -0500 Subject: Version 3.1.11 works on Windows again This undoes https://github.com/rails/rails/commit/7241498e51120b9847a8bc16cf48551db0f3e216 https://github.com/codahale/bcrypt-ruby/issues/128 is fixed and closed. --- Gemfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index a0f1cfacdc..3361818556 100644 --- a/Gemfile +++ b/Gemfile @@ -17,13 +17,7 @@ gem 'turbolinks', github: 'turbolinks/turbolinks-rails' # 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. -platforms :mingw, :x64_mingw, :mswin, :mswin64 do - gem 'bcrypt-ruby', '~> 3.0.0', require: false -end - -platforms :ruby, :jruby, :rbx do - gem 'bcrypt', '~> 3.1.10', require: false -end +gem 'bcrypt', '~> 3.1.11', require: false # This needs to be with require false to avoid it being automatically loaded by # sprockets. -- cgit v1.2.3