aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-04-25 00:59:45 -0400
committerGitHub <noreply@github.com>2018-04-25 00:59:45 -0400
commitf8a4bdd029c5c10cb4b65f54f9693c0b735596c4 (patch)
tree00fd2cf20eccee739fc657d88205efdbc41de659 /Gemfile.lock
parent4fd87b2444ebf579b4bbaa5da34bcedef9ee5179 (diff)
parent0f9f8363634227c317806c47dfa192964e410f88 (diff)
downloadrails-f8a4bdd029c5c10cb4b65f54f9693c0b735596c4.tar.gz
rails-f8a4bdd029c5c10cb4b65f54f9693c0b735596c4.tar.bz2
rails-f8a4bdd029c5c10cb4b65f54f9693c0b735596c4.zip
Merge pull request #32713 from utilum/max_ffi_version
Fix segmentation fault in EventedFileUpdateChecker
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock9
1 files changed, 5 insertions, 4 deletions
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)