diff options
author | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
commit | f95637178671b1aa0648fa506231717229a6cd8f (patch) | |
tree | fbaa725bcdb88220c5d1e299b338b196822460e5 /Gemfile.lock | |
parent | 2c6fcb9cf8fbb09e900fc3625837529155f98f4f (diff) | |
parent | db5baf3d1a93cbf6961f721205cff0beaf71bffd (diff) |
Merge branch 'glitch'
Conflicts: yarn.lock: caniuse-lite has been outdated in upstream for awhile, and we fixed it a few weeks ago in our fork
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0ff28ff43..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.452.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.94.1) + aws-sdk-s3 (1.95.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -211,7 +211,7 @@ GEM tzinfo excon (0.76.0) fabrication (2.22.0) - faker (2.17.0) + faker (2.18.0) i18n (>= 1.6, < 2) faraday (1.3.0) faraday-net_http (~> 1.0) @@ -273,7 +273,7 @@ GEM http-parser (1.2.1) ffi-compiler (>= 1.0, < 2.0) http_accept_language (2.1.1) - httplog (1.4.3) + httplog (1.5.0) rack (>= 1.0) rainbow (>= 2.0.0) i18n (1.8.10) @@ -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.3) + nokogiri (1.11.6) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.4) @@ -428,7 +433,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) - puma (5.3.0) + puma (5.3.2) nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) @@ -525,7 +530,7 @@ GEM rspec-support (3.10.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.14.0) + rubocop (1.15.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -570,12 +575,12 @@ GEM sidekiq (>= 3) thwait tilt (>= 1.4.0) - sidekiq-unique-jobs (7.0.9) + 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) thor (>= 0.20, < 2.0) - simple-navigation (4.1.0) + simple-navigation (4.3.0) activesupport (>= 2.3.2) simple_form (5.1.0) actionpack (>= 5.2) @@ -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) @@ -647,11 +653,11 @@ GEM safety_net_attestation (~> 0.4.0) securecompare (~> 1.0) tpm-key_attestation (~> 0.9.0) - webmock (3.12.2) + webmock (3.13.0) 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 +682,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) @@ -705,7 +711,7 @@ DEPENDENCIES dotenv-rails (~> 2.7) ed25519 (~> 1.2) fabrication (~> 2.22) - faker (~> 2.17) + faker (~> 2.18) fast_blank (~> 1.0) fastimage fog-core (<= 2.1.0) @@ -716,7 +722,7 @@ DEPENDENCIES htmlentities (~> 4.3) http (~> 4.4) http_accept_language (~> 2.1) - httplog (~> 1.4.3) + httplog (~> 1.5.0) i18n-tasks (~> 0.9) idn-ruby iso-639 @@ -771,7 +777,7 @@ DEPENDENCIES rspec-rails (~> 5.0) rspec-sidekiq (~> 3.1) rspec_junit_formatter (~> 0.4) - rubocop (~> 1.14) + rubocop (~> 1.15) rubocop-rails (~> 2.10) ruby-progressbar (~> 1.11) sanitize (~> 5.2) @@ -780,7 +786,7 @@ DEPENDENCIES sidekiq-bulk (~> 0.2.0) sidekiq-scheduler (~> 3.0) sidekiq-unique-jobs (~> 7.0) - simple-navigation (~> 4.1) + simple-navigation (~> 4.3) simple_form (~> 5.1) simplecov (~> 0.21) sprockets (~> 3.7.2) @@ -793,7 +799,7 @@ DEPENDENCIES twitter-text (~> 3.1.0) tzinfo-data (~> 1.2021) webauthn (~> 3.0.0.alpha1) - webmock (~> 3.12) - webpacker (~> 5.3) + webmock (~> 3.13) + webpacker (~> 5.4) webpush (~> 0.3) xorcist (~> 1.1) |