diff --git a/Gemfile b/Gemfile index 18e8119c9..072bcb21f 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ gem 'nokogiri', '1.16.5' gem 'puma' gem 'rack-attack' gem 'rack-cors', '1.0.6', require: 'rack/cors' -gem 'sidekiq', '5.2.10' +gem 'sidekiq', '7.3.9' gem 'sidekiq-cloudwatchmetrics' gem 'pusher' gem 'redis-namespace' @@ -125,7 +125,7 @@ gem 'bitly', require: false gem 'open_uri_redirections', require: false gem 'jsonapi-resources' gem 'bootsnap', require: false -gem 'sidekiq-cron', '~> 1.1' +gem 'sidekiq-cron', '~> 2.4' gem 'parse-cron' gem 'streamio-ffmpeg' gem 'rdoc', '6.3.4.1' diff --git a/Gemfile.lock b/Gemfile.lock index 7256c31fb..cf95b0020 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,62 +74,62 @@ GEM specs: aasm (5.2.0) concurrent-ruby (~> 1.0) - actioncable (6.1.7.8) - actionpack (= 6.1.7.8) - activesupport (= 6.1.7.8) + actioncable (6.1.7.10) + actionpack (= 6.1.7.10) + activesupport (= 6.1.7.10) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.8) - actionpack (= 6.1.7.8) - activejob (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + actionmailbox (6.1.7.10) + actionpack (= 6.1.7.10) + activejob (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) mail (>= 2.7.1) - actionmailer (6.1.7.8) - actionpack (= 6.1.7.8) - actionview (= 6.1.7.8) - activejob (= 6.1.7.8) - activesupport (= 6.1.7.8) + actionmailer (6.1.7.10) + actionpack (= 6.1.7.10) + actionview (= 6.1.7.10) + activejob (= 6.1.7.10) + activesupport (= 6.1.7.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.8) - actionview (= 6.1.7.8) - activesupport (= 6.1.7.8) + actionpack (6.1.7.10) + actionview (= 6.1.7.10) + activesupport (= 6.1.7.10) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.8) - actionpack (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + actiontext (6.1.7.10) + actionpack (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) nokogiri (>= 1.8.5) - actionview (6.1.7.8) - activesupport (= 6.1.7.8) + actionview (6.1.7.10) + activesupport (= 6.1.7.10) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.8) - activesupport (= 6.1.7.8) + activejob (6.1.7.10) + activesupport (= 6.1.7.10) globalid (>= 0.3.6) - activemodel (6.1.7.8) - activesupport (= 6.1.7.8) - activerecord (6.1.7.8) - activemodel (= 6.1.7.8) - activesupport (= 6.1.7.8) + activemodel (6.1.7.10) + activesupport (= 6.1.7.10) + activerecord (6.1.7.10) + activemodel (= 6.1.7.10) + activesupport (= 6.1.7.10) activerecord-import (1.1.0) activerecord (>= 3.2) - activestorage (6.1.7.8) - actionpack (= 6.1.7.8) - activejob (= 6.1.7.8) - activerecord (= 6.1.7.8) - activesupport (= 6.1.7.8) + activestorage (6.1.7.10) + actionpack (= 6.1.7.10) + activejob (= 6.1.7.10) + activerecord (= 6.1.7.10) + activesupport (= 6.1.7.10) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.8) + activesupport (6.1.7.10) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -147,11 +147,11 @@ GEM warden awesome_print (1.9.2) aws-eventstream (1.4.0) - aws-partitions (1.1196.0) - aws-sdk-cloudwatch (1.62.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.240.0) + aws-partitions (1.1246.0) + aws-sdk-cloudwatch (1.135.0) + aws-sdk-core (~> 3, >= 3.244.0) + aws-sigv4 (~> 1.5) + aws-sdk-core (3.246.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -170,13 +170,13 @@ GEM aws-eventstream (~> 1, >= 1.0.2) base64 (0.3.0) bcrypt (3.1.22) - bigdecimal (4.0.1) - bitly (2.0.1) - oauth2 (>= 0.5.0, < 2.0) + bigdecimal (4.1.2) + bitly (3.1.0) + oauth2 (>= 0.5.0, < 2.1) bootsnap (1.16.0) msgpack (~> 1.2) - buftok (0.2.0) - builder (3.2.4) + buftok (1.0.1) + builder (3.3.0) bumbler (0.8.0) byebug (11.1.3) cancancan (1.17.0) @@ -187,6 +187,7 @@ GEM ssrf_filter (~> 1.0) carrierwave-video-thumbnailer (0.1.4) carrierwave + cgi (0.5.1) chartkick (4.1.3) chronic_duration (0.10.6) numerizer (~> 0.1.1) @@ -196,10 +197,13 @@ GEM simplecov colorize (0.8.1) concurrent-ruby (1.2.2) - connection_pool (2.2.5) + connection_pool (3.0.2) crack (0.4.5) rexml crass (1.0.6) + cronex (0.15.0) + tzinfo + unicode (>= 0.4.4.5) daemons (1.4.1) date (3.5.1) debugger-ruby_core_source (1.3.8) @@ -225,8 +229,7 @@ GEM devise (>= 4.6) diff-lcs (1.5.0) docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20240107) elasticsearch (7.10.1) elasticsearch-api (= 7.10.1) elasticsearch-transport (= 7.10.1) @@ -246,9 +249,9 @@ GEM faraday (~> 1) multi_json encryptor (3.0.0) - equalizer (0.0.11) - erubi (1.12.0) - et-orbi (1.2.11) + equalizer (1.0.0) + erubi (1.13.1) + et-orbi (1.4.0) tzinfo ethon (0.16.0) ffi (>= 1.15.0) @@ -280,11 +283,8 @@ GEM faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) - faraday-retry (1.0.3) - ffi (1.15.5) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) - rake + faraday-retry (1.0.4) + ffi (1.17.4) file_validators (3.0.0) activemodel (>= 3.2) mime-types (>= 1.0) @@ -307,8 +307,8 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (1.1.0) - fugit (1.11.1) - et-orbi (~> 1, >= 1.2.11) + fugit (1.12.1) + et-orbi (~> 1.4) raabro (~> 1.4) fx (0.8.0) activerecord (>= 6.0.0) @@ -318,7 +318,7 @@ GEM geojsonlint (0.1.3) activemodel (>= 3.0.0) json-schema (~> 2.5.0) - globalid (1.2.1) + globalid (1.3.0) activesupport (>= 6.1) google-apis-core (0.4.2) addressable (~> 2.5, >= 2.5.1) @@ -355,20 +355,14 @@ GEM hashdiff (1.0.1) hashie (5.0.0) htmlentities (4.3.4) - http (4.4.1) - addressable (~> 2.3) + http (6.0.3) http-cookie (~> 1.0) - http-form_data (~> 2.2) - http-parser (~> 1.2.0) + llhttp (~> 0.6.1) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.1.6) domain_name (~> 0.5) - http-form_data (2.3.0) - http-parser (1.2.3) - ffi-compiler (>= 1.0, < 2.0) - http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (1.14.5) + i18n (1.14.8) concurrent-ruby (~> 1.0) i18n-generators (1.1.3) mechanize @@ -389,6 +383,7 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + llhttp (0.6.1) logger (1.7.0) lograge (0.11.2) actionpack (>= 4) @@ -398,12 +393,13 @@ GEM loofah (2.21.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.8.1) + mail (2.9.0) + logger mini_mime (>= 0.1.1) net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.1.0) mechanize (2.8.5) addressable (~> 2.8) domain_name (~> 0.5, >= 0.5.20190701) @@ -416,15 +412,14 @@ GEM webrick (~> 1.7) webrobots (~> 0.1.2) memoist (0.16.2) - memoizable (0.4.2) - thread_safe (~> 0.3, >= 0.3.1) - method_source (1.0.0) + memoizable (0.5.1) + method_source (1.1.0) mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) mini_magick (4.10.1) mini_mime (1.1.5) - mini_portile2 (2.8.7) + mini_portile2 (2.8.9) minitest (5.19.0) minitest-hooks (1.5.0) minitest (> 5.3) @@ -434,41 +429,46 @@ GEM ruby2_keywords (>= 0.0.5) msgpack (1.7.0) multi_json (1.15.0) - multi_xml (0.6.0) + multi_xml (0.9.1) + bigdecimal (>= 3.1, < 5) multipart-post (2.4.1) - naught (1.1.0) + naught (2.3.0) net-http-digest_auth (1.4.1) - net-http-persistent (4.0.1) - connection_pool (~> 2.2) - net-imap (0.4.24) + net-http-persistent (4.0.8) + connection_pool (>= 2.2.4, < 4) + net-imap (0.6.4) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.1) net-protocol netrc (0.11.0) - nio4r (2.7.3) + nio4r (2.7.5) nokogiri (1.16.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) numerizer (0.1.1) - oauth2 (1.4.9) - faraday (>= 0.17.3, < 3.0) - jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) + oauth2 (2.0.18) + faraday (>= 0.17.3, < 4.0) + jwt (>= 1.0, < 4.0) + logger (~> 1.2) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - omniauth (1.9.2) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0, >= 2.0.3) + version_gem (~> 1.1, >= 1.1.9) + omniauth (2.1.4) hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) + logger + rack (>= 2.2.3) + rack-protection omniauth-facebook (9.0.0) omniauth-oauth2 (~> 1.2) - omniauth-oauth2 (1.3.1) - oauth2 (~> 1.0) - omniauth (~> 1.2) + omniauth-oauth2 (1.9.0) + oauth2 (>= 2.0.2, < 3) + omniauth (~> 2.0) open_uri_redirections (0.2.1) opentelemetry-api (1.4.0) opentelemetry-common (0.21.0) @@ -484,14 +484,14 @@ GEM opentelemetry-api (~> 1.0) orm_adapter (0.5.0) os (1.1.4) - pact (1.62.0) + pact (1.65.0) pact-mock_service (~> 3.0, >= 3.3.1) pact-support (~> 1.16, >= 1.16.9) - rack-test (>= 0.6.3, < 2.0.0) + rack-test (>= 0.6.3, < 3.0.0) rspec (~> 3.0) - term-ansicolor (~> 1.0) + term-ansicolor (~> 1.7) thor (>= 0.20, < 2.0) - webrick (~> 1.3) + webrick (~> 1.8) pact-consumer-minitest (1.0.1) minitest (>= 5.0.0) pact (~> 1.3) @@ -532,7 +532,7 @@ GEM activesupport (>= 3.0) phony (>= 2.18.12) promise.rb (0.7.4) - public_suffix (4.0.7) + public_suffix (7.0.5) puma (5.6.9) nio4r (~> 2.0) pusher (2.0.2) @@ -541,7 +541,7 @@ GEM pusher-signature (~> 0.1.8) pusher-signature (0.1.8) raabro (1.4.0) - racc (1.8.0) + racc (1.8.1) rack (2.2.23) rack-attack (6.7.0) rack (>= 1.0, < 4) @@ -549,51 +549,52 @@ GEM rack (>= 1.6.0) rack-protection (2.2.0) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) + rack-test (2.2.0) + rack (>= 1.3) railroady (1.6.0) - rails (6.1.7.8) - actioncable (= 6.1.7.8) - actionmailbox (= 6.1.7.8) - actionmailer (= 6.1.7.8) - actionpack (= 6.1.7.8) - actiontext (= 6.1.7.8) - actionview (= 6.1.7.8) - activejob (= 6.1.7.8) - activemodel (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + rails (6.1.7.10) + actioncable (= 6.1.7.10) + actionmailbox (= 6.1.7.10) + actionmailer (= 6.1.7.10) + actionpack (= 6.1.7.10) + actiontext (= 6.1.7.10) + actionview (= 6.1.7.10) + activejob (= 6.1.7.10) + activemodel (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) bundler (>= 1.15.0) - railties (= 6.1.7.8) + railties (= 6.1.7.10) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) rails-graphql-generator (0.1.0) rails-html-sanitizer (1.4.4) loofah (~> 2.19, >= 2.19.1) - railties (6.1.7.8) - actionpack (= 6.1.7.8) - activesupport (= 6.1.7.8) + railties (6.1.7.10) + actionpack (= 6.1.7.10) + activesupport (= 6.1.7.10) method_source rake (>= 12.2) thor (~> 1.0) rainbow (2.2.2) rake - rake (13.1.0) + rake (13.4.2) rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) rblineprof (0.3.7) debugger-ruby_core_source (~> 1.3) rdoc (6.3.4.1) - redis (4.5.1) + redis (5.4.1) + redis-client (>= 0.22.0) redis-actionpack (5.3.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 3) @@ -601,10 +602,12 @@ GEM redis-activesupport (5.3.0) activesupport (>= 3, < 8) redis-store (>= 1.3, < 2) + redis-client (0.29.0) + connection_pool redis-namespace (1.8.2) redis (>= 3.0.4) - redis-objects (1.5.1) - redis (~> 4.2) + redis-objects (2.0.0) + redis (~> 5.0) redis-rack (2.1.4) rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) @@ -612,8 +615,8 @@ GEM redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.9.1) - redis (>= 4, < 5) + redis-store (1.11.0) + redis (>= 4, < 6) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -634,10 +637,10 @@ GEM retriable (3.1.2) rexml (3.4.2) rotp (6.3.0) - rqrcode (2.1.1) + rqrcode (3.2.0) chunky_png (~> 1.0) - rqrcode_core (~> 1.0) - rqrcode_core (1.2.0) + rqrcode_core (~> 2.0) + rqrcode_core (2.1.0) rspec (3.11.0) rspec-core (~> 3.11.0) rspec-expectations (~> 3.11.0) @@ -678,22 +681,25 @@ GEM sentry-sidekiq (5.8.0) sentry-ruby (~> 5.8.0) sidekiq (>= 3.0) - shortener (0.8.2) - voight_kampff (~> 1.1.2) - sidekiq (5.2.10) - connection_pool (~> 2.2, >= 2.2.2) - rack (~> 2.0) - rack-protection (>= 1.5.0) - redis (~> 4.5, < 4.6.0) + shortener (1.0.2) + voight_kampff (~> 2.0) + sidekiq (7.3.9) + base64 + connection_pool (>= 2.3.0) + logger + rack (>= 2.2.4) + redis-client (>= 0.22.2) sidekiq-benchmark (0.7.1) chartkick (>= 1.1.1) sidekiq (> 5) - sidekiq-cloudwatchmetrics (2.2.0) + sidekiq-cloudwatchmetrics (2.9.0) aws-sdk-cloudwatch (~> 1.6) - sidekiq (>= 5.0, < 7.0) - sidekiq-cron (1.2.0) - fugit (~> 1.1) - sidekiq (>= 4.2.1) + sidekiq (>= 5.0, < 9.0) + sidekiq-cron (2.4.0) + cronex (>= 0.13.0) + fugit (~> 1.8, >= 1.11.1) + globalid (>= 1.0.1) + sidekiq (>= 6.5.0) sidekiq-status (2.1.3) chronic_duration sidekiq (>= 5.0) @@ -702,7 +708,9 @@ GEM faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simple_oauth (0.3.1) + simple_oauth (0.4.1) + base64 + cgi simplecov (0.17.0) docile (~> 1.1) json (>= 1.8, < 3) @@ -712,12 +720,15 @@ GEM simplecov terminal-table simplecov-html (0.10.2) + snaky_hash (2.0.3) + hashie (>= 0.1.0, < 6) + version_gem (>= 1.1.8, < 3) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) ssrf_filter (1.0.7) streamio-ffmpeg (3.0.2) @@ -732,8 +743,7 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.4.0) - thread_safe (0.3.6) + thor (1.5.0) timeout (0.6.1) tins (1.31.0) sync @@ -742,17 +752,15 @@ GEM turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - twitter (7.0.0) - addressable (~> 2.3) - buftok (~> 0.2.0) - equalizer (~> 0.0.11) - http (~> 4.0) - http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) - memoizable (~> 0.4.0) - multipart-post (~> 2.0) - naught (~> 1.0) - simple_oauth (~> 0.3.0) + twitter (8.3.1) + base64 (~> 0.3.0) + buftok (~> 1.0) + equalizer (~> 1.0) + http (~> 6.0) + memoizable (~> 0.5.1) + naught (~> 2.3) + simple_oauth (~> 0.4.0) + uri (~> 1.1) twitter-text (3.1.0) idn-ruby unf (~> 0.1.0) @@ -763,11 +771,14 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.2) + unf_ext (0.0.9.1) + unicode (0.4.4.5) unicode-display_width (1.6.0) + uri (1.1.1) useragent (0.16.10) - voight_kampff (1.1.4) - rack (>= 1.4, < 3.0) + version_gem (1.1.9) + voight_kampff (2.0.0) + rack (>= 1.4) warden (1.2.9) rack (>= 2.0.9) webmock (3.14.0) @@ -776,10 +787,11 @@ GEM hashdiff (>= 0.4.0, < 2.0.0) webrick (1.8.2) webrobots (0.1.2) - websocket-driver (0.7.6) + websocket-driver (0.8.0) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.15) + zeitwerk (2.7.5) PLATFORMS ruby @@ -892,10 +904,10 @@ DEPENDENCIES sentry-ruby sentry-sidekiq shortener - sidekiq (= 5.2.10) + sidekiq (= 7.3.9) sidekiq-benchmark (= 0.7.1) sidekiq-cloudwatchmetrics - sidekiq-cron (~> 1.1) + sidekiq-cron (~> 2.4) sidekiq-status simplecov (= 0.17.0) simplecov-console