diff options
| author | T.J. Schuck <tj@getharvest.com> | 2016-03-10 14:13:21 -0500 |
|---|---|---|
| committer | T.J. Schuck <tj@getharvest.com> | 2016-03-10 14:13:21 -0500 |
| commit | efbfdd4049aa1101783d944199442e57081c4482 (patch) | |
| tree | 9356bb5995a47bc99694feb5818f0f89b766ebce /Gemfile | |
| parent | b785064958f9c5224d19faf3b1a15887542c00a7 (diff) | |
| download | rails-efbfdd4049aa1101783d944199442e57081c4482.tar.gz rails-efbfdd4049aa1101783d944199442e57081c4482.tar.bz2 rails-efbfdd4049aa1101783d944199442e57081c4482.zip | |
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.
Diffstat (limited to 'Gemfile')
| -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. |