mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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
This commit is contained in:
parent
e8655fa6b9
commit
7008dfba66
2 changed files with 11 additions and 2 deletions
2
Gemfile
2
Gemfile
|
@ -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
|
||||
|
|
11
Gemfile.lock
11
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)
|
||||
|
|
Loading…
Reference in a new issue