Merge pull request #24144 from tjschuck/bcrypt_on_windows_fixed

Version 3.1.11 works on Windows again
This commit is contained in:
Rafael França 2016-03-10 16:26:15 -03:00
commit a73ce897cf

@ -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.