diff --git a/Gemfile b/Gemfile index 47de8e1a5b476..6656d083d431b 100644 --- a/Gemfile +++ b/Gemfile @@ -98,7 +98,7 @@ gem "rolify", "~> 6.0" # Very simple Roles library gem "rouge", "~> 3.26" # A pure-ruby code highlighter gem "rubyzip", "~> 2.3" # Rubyzip is a ruby library for reading and writing zip files gem "s3_direct_upload", "~> 0.1" # Direct Upload to Amazon S3 -gem "sidekiq", "~> 6.2.2" # Sidekiq is used to process background jobs with the help of Redis +gem "sidekiq", "~> 7.0.2" # Sidekiq is used to process background jobs with the help of Redis gem "sidekiq-cron", "~> 1.1" # Allows execution of scheduled cron jobs as specific times gem "sidekiq-unique-jobs", "~> 7.1.8" # Ensures that Sidekiq jobs are unique when enqueued gem "slack-notifier", "~> 2.4" # A slim ruby wrapper for posting to slack webhooks diff --git a/Gemfile.lock b/Gemfile.lock index 6adb119d0e3bd..2bd6f6375544e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,7 +178,7 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.1.9) - connection_pool (2.2.5) + connection_pool (2.3.0) counter_culture (3.0.0) activerecord (>= 4.2) activesupport (>= 4.2) @@ -465,7 +465,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.11.0) mini_mime (1.1.2) - mini_portile2 (2.6.1) + mini_portile2 (2.8.0) minitest (5.14.4) modis (4.0.0) activemodel (>= 5.2) @@ -486,14 +486,14 @@ GEM http-2 (~> 0.11) netrc (0.11.0) nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.12.5-arm64-darwin) + nokogiri (1.13.9-arm64-darwin) racc (~> 1.4) - nokogiri (1.12.5-x86_64-darwin) + nokogiri (1.13.9-x86_64-darwin) racc (~> 1.4) - nokogiri (1.12.5-x86_64-linux) + nokogiri (1.13.9-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -560,8 +560,8 @@ GEM pusher-signature (~> 0.1.8) pusher-signature (0.1.8) raabro (1.4.0) - racc (1.6.0) - rack (2.2.3) + racc (1.6.1) + rack (2.2.4) rack-attack (6.5.0) rack (>= 1.0, < 3) rack-cors (1.1.1) @@ -624,6 +624,8 @@ GEM redis-activesupport (5.2.0) activesupport (>= 3, < 7) redis-store (>= 1.3, < 2) + redis-client (0.11.2) + connection_pool redis-rack (2.0.6) rack (>= 1.5, < 3) redis-store (>= 1.2, < 2) @@ -751,10 +753,11 @@ GEM shellany (0.0.1) shoulda-matchers (5.0.0) activesupport (>= 5.2.0) - sidekiq (6.2.2) - connection_pool (>= 2.2.2) - rack (~> 2.0) - redis (>= 4.2.0) + sidekiq (7.0.2) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + rack (>= 2.2.4) + redis-client (>= 0.11.0) sidekiq-cron (1.2.0) fugit (~> 1.1) sidekiq (>= 4.2.1) @@ -1004,7 +1007,7 @@ DEPENDENCIES s3_direct_upload (~> 0.1) sassc-rails (~> 2.1.2) shoulda-matchers (~> 5.0.0) - sidekiq (~> 6.2.2) + sidekiq (~> 7.0.2) sidekiq-cron (~> 1.1) sidekiq-unique-jobs (~> 7.1.8) simplecov (~> 0.21.2) diff --git a/vendor/cache/connection_pool-2.2.5.gem b/vendor/cache/connection_pool-2.2.5.gem deleted file mode 100644 index 923bb40c3c20e..0000000000000 Binary files a/vendor/cache/connection_pool-2.2.5.gem and /dev/null differ diff --git a/vendor/cache/connection_pool-2.3.0.gem b/vendor/cache/connection_pool-2.3.0.gem new file mode 100644 index 0000000000000..fba190cb63c74 Binary files /dev/null and b/vendor/cache/connection_pool-2.3.0.gem differ diff --git a/vendor/cache/mini_portile2-2.6.1.gem b/vendor/cache/mini_portile2-2.6.1.gem deleted file mode 100644 index 3e5b08d4a8003..0000000000000 Binary files a/vendor/cache/mini_portile2-2.6.1.gem and /dev/null differ diff --git a/vendor/cache/mini_portile2-2.8.0.gem b/vendor/cache/mini_portile2-2.8.0.gem new file mode 100644 index 0000000000000..41f04a4409c85 Binary files /dev/null and b/vendor/cache/mini_portile2-2.8.0.gem differ diff --git a/vendor/cache/nokogiri-1.12.5-arm64-darwin.gem b/vendor/cache/nokogiri-1.12.5-arm64-darwin.gem deleted file mode 100644 index c99f62e8d90e8..0000000000000 Binary files a/vendor/cache/nokogiri-1.12.5-arm64-darwin.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.12.5-x86_64-darwin.gem b/vendor/cache/nokogiri-1.12.5-x86_64-darwin.gem deleted file mode 100644 index b70705eeaa79f..0000000000000 Binary files a/vendor/cache/nokogiri-1.12.5-x86_64-darwin.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.12.5-x86_64-linux.gem b/vendor/cache/nokogiri-1.12.5-x86_64-linux.gem deleted file mode 100644 index ff9445c1e3595..0000000000000 Binary files a/vendor/cache/nokogiri-1.12.5-x86_64-linux.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.12.5.gem b/vendor/cache/nokogiri-1.12.5.gem deleted file mode 100644 index 5ece6d833e90a..0000000000000 Binary files a/vendor/cache/nokogiri-1.12.5.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.13.9-arm64-darwin.gem b/vendor/cache/nokogiri-1.13.9-arm64-darwin.gem new file mode 100644 index 0000000000000..951da0c0b5907 Binary files /dev/null and b/vendor/cache/nokogiri-1.13.9-arm64-darwin.gem differ diff --git a/vendor/cache/nokogiri-1.13.9-x86_64-darwin.gem b/vendor/cache/nokogiri-1.13.9-x86_64-darwin.gem new file mode 100644 index 0000000000000..2b2dbcb4742e2 Binary files /dev/null and b/vendor/cache/nokogiri-1.13.9-x86_64-darwin.gem differ diff --git a/vendor/cache/nokogiri-1.13.9-x86_64-linux.gem b/vendor/cache/nokogiri-1.13.9-x86_64-linux.gem new file mode 100644 index 0000000000000..266ae3e3efdce Binary files /dev/null and b/vendor/cache/nokogiri-1.13.9-x86_64-linux.gem differ diff --git a/vendor/cache/nokogiri-1.13.9.gem b/vendor/cache/nokogiri-1.13.9.gem new file mode 100644 index 0000000000000..50e0aa62878e9 Binary files /dev/null and b/vendor/cache/nokogiri-1.13.9.gem differ diff --git a/vendor/cache/racc-1.6.0.gem b/vendor/cache/racc-1.6.0.gem deleted file mode 100644 index 7015819f1d73a..0000000000000 Binary files a/vendor/cache/racc-1.6.0.gem and /dev/null differ diff --git a/vendor/cache/racc-1.6.1.gem b/vendor/cache/racc-1.6.1.gem new file mode 100644 index 0000000000000..a59e84b226c17 Binary files /dev/null and b/vendor/cache/racc-1.6.1.gem differ diff --git a/vendor/cache/rack-2.2.3.gem b/vendor/cache/rack-2.2.3.gem deleted file mode 100644 index 19fa2e9ffc9cb..0000000000000 Binary files a/vendor/cache/rack-2.2.3.gem and /dev/null differ diff --git a/vendor/cache/rack-2.2.4.gem b/vendor/cache/rack-2.2.4.gem new file mode 100644 index 0000000000000..cff677e7af08f Binary files /dev/null and b/vendor/cache/rack-2.2.4.gem differ diff --git a/vendor/cache/redis-client-0.11.2.gem b/vendor/cache/redis-client-0.11.2.gem new file mode 100644 index 0000000000000..c66ced1ad71bd Binary files /dev/null and b/vendor/cache/redis-client-0.11.2.gem differ diff --git a/vendor/cache/sidekiq-6.2.2.gem b/vendor/cache/sidekiq-6.2.2.gem deleted file mode 100644 index 6b17ae84d9b31..0000000000000 Binary files a/vendor/cache/sidekiq-6.2.2.gem and /dev/null differ diff --git a/vendor/cache/sidekiq-7.0.2.gem b/vendor/cache/sidekiq-7.0.2.gem new file mode 100644 index 0000000000000..9c7f971c79f21 Binary files /dev/null and b/vendor/cache/sidekiq-7.0.2.gem differ