diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-04-25 00:59:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-25 00:59:45 -0400 |
commit | f8a4bdd029c5c10cb4b65f54f9693c0b735596c4 (patch) | |
tree | 00fd2cf20eccee739fc657d88205efdbc41de659 | |
parent | 4fd87b2444ebf579b4bbaa5da34bcedef9ee5179 (diff) | |
parent | 0f9f8363634227c317806c47dfa192964e410f88 (diff) | |
download | rails-f8a4bdd029c5c10cb4b65f54f9693c0b735596c4.tar.gz rails-f8a4bdd029c5c10cb4b65f54f9693c0b735596c4.tar.bz2 rails-f8a4bdd029c5c10cb4b65f54f9693c0b735596c4.zip |
Merge pull request #32713 from utilum/max_ffi_version
Fix segmentation fault in EventedFileUpdateChecker
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | Gemfile.lock | 9 |
2 files changed, 6 insertions, 4 deletions
@@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 5233136c32..3c73f45626 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) |