about summary refs log tree commit diff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-06-03 20:47:02 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-06-03 20:47:02 +0200
commit0157caacefe34838ff5d5093dc188f5491cb7b15 (patch)
treea5b56590b7660b6ed3257f929bf209a26cb25a15 /Gemfile.lock
parent02dffa8edd097014578774aed30249ed08d2f3a4 (diff)
parentf6088922c06f3da02e9051b39f3a7111f19298dd (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock14
1 files changed, 10 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 252788b55..1fc65d31c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,7 +79,7 @@ GEM
       encryptor (~> 3.0.0)
     awrence (1.1.1)
     aws-eventstream (1.1.1)
-    aws-partitions (1.461.0)
+    aws-partitions (1.465.0)
     aws-sdk-core (3.114.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -88,7 +88,7 @@ GEM
     aws-sdk-kms (1.43.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.95.0)
+    aws-sdk-s3 (1.95.1)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -354,17 +354,22 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.0.3)
-    mini_portile2 (2.5.1)
+    mini_portile2 (2.5.2)
+      net-ftp (~> 0.1)
     minitest (5.14.4)
     msgpack (1.4.2)
     multi_json (1.15.0)
     multipart-post (2.1.1)
+    net-ftp (0.1.2)
+      net-protocol
+      time
     net-ldap (0.17.0)
+    net-protocol (0.1.0)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
     nio4r (2.5.7)
-    nokogiri (1.11.5)
+    nokogiri (1.11.6)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     nokogumbo (2.0.4)
@@ -610,6 +615,7 @@ GEM
     thwait (0.2.0)
       e2mmap
     tilt (2.0.10)
+    time (0.1.0)
     tpm-key_attestation (0.9.0)
       bindata (~> 2.4)
       openssl-signature_algorithm (~> 0.4.0)