diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-05-27 17:58:44 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-05-27 17:58:44 +0200 |
commit | 10a31a934fb62a95d6144794b9c449f1092593f0 (patch) | |
tree | 193863c7b8bbd25c77ea6489134db3cb9397ed3f /Gemfile.lock | |
parent | 2024aef0f9b52297d814811f5825678a563f78ff (diff) | |
parent | 2efe711a517642cd7032aee318c85f6c158ee0ca (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream's README got updated, but we have a completely different one. Kept ours.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a58d0bf5c..7bb1930a0 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.452.0) + aws-partitions (1.461.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.94.1) + aws-sdk-s3 (1.95.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -364,7 +364,7 @@ GEM net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) nio4r (2.5.7) - nokogiri (1.11.4) + nokogiri (1.11.5) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.4) @@ -428,7 +428,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) - puma (5.3.1) + puma (5.3.2) nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) @@ -570,7 +570,7 @@ GEM sidekiq (>= 3) thwait tilt (>= 1.4.0) - sidekiq-unique-jobs (7.0.10) + sidekiq-unique-jobs (7.0.11) brpoplpush-redis_script (> 0.1.1, <= 2.0.0) concurrent-ruby (~> 1.0, >= 1.0.5) sidekiq (>= 5.0, < 7.0) @@ -651,7 +651,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webpacker (5.3.0) + webpacker (5.4.0) activesupport (>= 5.2) rack-proxy (>= 0.6.1) railties (>= 5.2) @@ -676,7 +676,7 @@ DEPENDENCIES active_record_query_trace (~> 1.8) addressable (~> 2.7) annotate (~> 3.1) - aws-sdk-s3 (~> 1.94) + aws-sdk-s3 (~> 1.95) better_errors (~> 2.9) binding_of_caller (~> 1.0) blurhash (~> 0.1) @@ -794,6 +794,6 @@ DEPENDENCIES tzinfo-data (~> 1.2021) webauthn (~> 3.0.0.alpha1) webmock (~> 3.13) - webpacker (~> 5.3) + webpacker (~> 5.4) webpush (~> 0.3) xorcist (~> 1.1) |