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

diff --git a/Gemfile.lock b/Gemfile.lock
index d87fa93accceee6da8efab5db5c374dd965a62e2..57edb880ebc21d22a91d94052a82903cc1d42905 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -209,8 +209,9 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     ffi (1.13.1)
     ffi-libarchive (1.0.4)
       ffi (~> 1.0)
@@ -411,6 +412,7 @@ GEM
       rubocop (>= 0.87.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     rubyzip (2.3.0)
     sanitize (5.2.1)
       crass (~> 1.0.2)