Merge remote-tracking branch 'upstream/pull/2257'

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index f21148fee790a1cc3e3721a7c3a07284ee9dbe6e..f9a0af7d4ed2ce9e2108be9ced7cd3b77217c3ba 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,6 +79,8 @@ GEM
       msgpack (~> 1.0)
     browser (2.5.3)
     builder (3.2.3)
+    bzip2-ffi (1.0.0)
+      ffi (~> 1.0)
     cancancan (3.0.1)
     canonical-rails (0.2.5)
       rails (>= 4.1, < 6.1)
@@ -177,8 +179,10 @@ GEM
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
+    ffi-libarchive (0.4.6)
+      ffi (~> 1.0)
     fspath (3.1.1)
-    gd2-ffij (0.3.0)
+    gd2-ffij (0.4.0)
       ffi (>= 1.0.0)
     geoip (1.6.4)
     globalid (0.4.2)
@@ -374,6 +378,9 @@ GEM
       unicode-display_width (>= 1.4.0, < 1.7)
     rubocop-performance (1.3.0)
       rubocop (>= 0.68.0)
+    rubocop-rails (2.0.0)
+      rack (>= 2.0)
+      rubocop (>= 0.70.0)
     ruby-openid (2.7.0)
     ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
@@ -452,6 +459,7 @@ DEPENDENCIES
   binding_of_caller
   bootsnap (>= 1.1.0)
   browser
+  bzip2-ffi
   cancancan
   canonical-rails
   capybara (~> 2.13)
@@ -468,7 +476,8 @@ DEPENDENCIES
   factory_bot_rails
   fakefs
   faraday
-  gd2-ffij
+  ffi-libarchive
+  gd2-ffij (>= 0.4.0)
   geoip
   htmlentities
   http_accept_language (~> 2.0.0)
@@ -482,6 +491,7 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   listen
   logstasher
+  mimemagic
   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)
   omniauth
@@ -509,6 +519,7 @@ DEPENDENCIES
   rotp
   rubocop
   rubocop-performance
+  rubocop-rails
   sanitize
   sassc-rails
   secure_headers