aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2018-09-05 17:56:57 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2018-09-05 17:56:57 -0400
commitf80722c0ebacaaee5d61bfa3359a9ec43d04ac78 (patch)
tree7d6be968f2d281bf39484fc4a2fdb9c4d779a136
parent9ee5b2847913591020bca5d9c1af48ed48be51be (diff)
downloadrails-f80722c0ebacaaee5d61bfa3359a9ec43d04ac78.tar.gz
rails-f80722c0ebacaaee5d61bfa3359a9ec43d04ac78.tar.bz2
rails-f80722c0ebacaaee5d61bfa3359a9ec43d04ac78.zip
Unlock ffi version
ffi has a security issue on versions before 1.9.24 so it is better to upgrade even if that occasionally cause failures in some contributors machines.
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock9
2 files changed, 4 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 09f89804d9..8302a86e9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,6 @@ 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 622f49ea4c..50b93abae0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -237,10 +237,10 @@ GEM
faye-websocket (0.10.7)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
- ffi (1.9.21)
- ffi (1.9.21-java)
- ffi (1.9.21-x64-mingw32)
- ffi (1.9.21-x86-mingw32)
+ ffi (1.9.25)
+ ffi (1.9.25-java)
+ ffi (1.9.25-x64-mingw32)
+ ffi (1.9.25-x86-mingw32)
fugit (1.1.6)
et-orbi (~> 1.1, >= 1.1.6)
raabro (~> 1.1)
@@ -523,7 +523,6 @@ DEPENDENCIES
dalli
delayed_job
delayed_job_active_record
- ffi (<= 1.9.21)
google-cloud-storage (~> 1.11)
hiredis
i18n (~> 1.0.1)