diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-04-07 08:35:02 +0900 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-09 19:25:11 -0300 |
| commit | 7008dfba6660d71463d0b82b20ac70e652174325 (patch) | |
| tree | 1b2192d79107081a9b1108692921398bc5ee1bd7 | |
| parent | e8655fa6b938d5c9d39d021be9ccef4f18c95b50 (diff) | |
| download | rails-7008dfba6660d71463d0b82b20ac70e652174325.tar.gz rails-7008dfba6660d71463d0b82b20ac70e652174325.tar.bz2 rails-7008dfba6660d71463d0b82b20ac70e652174325.zip | |
Gemfile: temporay pin "bcrypt" version and run "bundle update bcrypt" on Linux
Related: #19617, #19187, #19533, #19689, #19675.
This is POC (Proof Of Concept) which bundler does not remove mingw lines.
https://github.com/rails/rails/pull/19617#issuecomment-90293795
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 11 |
2 files changed, 11 insertions, 2 deletions
@@ -22,7 +22,7 @@ gem 'sprockets', '~> 3.0.0.rc.1' # require: false so bcrypt is loaded only when has_secure_password is used. # This is to avoid ActiveModel (and by extension the entire framework) # being dependent on a binary library. -gem 'bcrypt', '~> 3.1.7', require: false +gem 'bcrypt', '~> 3.1.10', require: false # This needs to be with require false to avoid # it being automatically loaded by sprockets diff --git a/Gemfile.lock b/Gemfile.lock index 82111e1eb3..543cfaf3da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,6 +99,8 @@ GEM beaneater (~> 0.3.1) dante (~> 0.1.5) bcrypt (3.1.10) + bcrypt (3.1.10-x64-mingw32) + bcrypt (3.1.10-x86-mingw32) beaneater (0.3.3) benchmark-ips (2.1.1) builder (3.2.2) @@ -126,6 +128,7 @@ GEM globalid (0.3.3) activesupport (>= 4.1.0) hitimes (1.2.2) + hitimes (1.2.2-x86-mingw32) i18n (0.7.0) json (1.8.2) kindlerb (0.1.1) @@ -147,6 +150,10 @@ GEM mysql2 (0.3.18) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) + nokogiri (1.6.6.2-x64-mingw32) + mini_portile (~> 0.6.0) + nokogiri (1.6.6.2-x86-mingw32) + mini_portile (~> 0.6.0) pg (0.18.1) psych (2.0.13) que (0.9.2) @@ -240,6 +247,8 @@ GEM PLATFORMS ruby + x64-mingw32 + x86-mingw32 DEPENDENCIES activerecord-jdbcmysql-adapter (>= 1.3.0) @@ -247,7 +256,7 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter (>= 1.3.0) arel! backburner - bcrypt (~> 3.1.7) + bcrypt (~> 3.1.10) benchmark-ips coffee-rails (~> 4.1.0) dalli (>= 2.2.1) |