1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge pull request #32713 from utilum/max_ffi_version

Fix segmentation fault in EventedFileUpdateChecker
This commit is contained in:
Rafael França 2018-04-25 00:59:45 -04:00 committed by GitHub
commit f8a4bdd029
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View file

@ -89,6 +89,7 @@ group :storage do
gem "azure-storage", require: false
gem "image_processing", "~> 1.2"
gem "ffi", "<= 1.9.21"
end
group :ujs do

View file

@ -227,10 +227,10 @@ GEM
faye-websocket (0.10.7)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.9.23)
ffi (1.9.23-java)
ffi (1.9.23-x64-mingw32)
ffi (1.9.23-x86-mingw32)
ffi (1.9.21)
ffi (1.9.21-java)
ffi (1.9.21-x64-mingw32)
ffi (1.9.21-x86-mingw32)
globalid (0.4.1)
activesupport (>= 4.2.0)
google-api-client (0.17.3)
@ -516,6 +516,7 @@ DEPENDENCIES
dalli
delayed_job
delayed_job_active_record
ffi (<= 1.9.21)
google-cloud-storage (~> 1.8)
hiredis
image_processing (~> 1.2)