diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-10 16:26:15 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-10 16:26:15 -0300 |
| commit | a73ce897cfc336dddca8ad4940ae650075d1c8ca (patch) | |
| tree | 9356bb5995a47bc99694feb5818f0f89b766ebce | |
| parent | b785064958f9c5224d19faf3b1a15887542c00a7 (diff) | |
| parent | efbfdd4049aa1101783d944199442e57081c4482 (diff) | |
| download | rails-a73ce897cfc336dddca8ad4940ae650075d1c8ca.tar.gz rails-a73ce897cfc336dddca8ad4940ae650075d1c8ca.tar.bz2 rails-a73ce897cfc336dddca8ad4940ae650075d1c8ca.zip | |
Merge pull request #24144 from tjschuck/bcrypt_on_windows_fixed
Version 3.1.11 works on Windows again
| -rw-r--r-- | Gemfile | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -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. |