diff --git a/Gemfile b/Gemfile index 2c72cc05df5d4..e15e1c710afb3 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,7 @@ gem "rubyzip", "~> 2.3" # Rubyzip is a ruby library for reading and writing zip gem "s3_direct_upload", "~> 0.1" # Direct Upload to Amazon S3 gem "sidekiq", "~> 6.2.1" # 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.0.7" # Ensures that Sidekiq jobs are unique when enqueued +gem "sidekiq-unique-jobs", "~> 7.1.29" # Ensures that Sidekiq jobs are unique when enqueued gem "sitemap_generator", "~> 6.1" # SitemapGenerator is a framework-agnostic XML Sitemap generator gem "slack-notifier", "~> 2.3" # A slim ruby wrapper for posting to slack webhooks gem "sprockets", "~> 4.0" # Sprockets is a Rack-based asset packaging system diff --git a/Gemfile.lock b/Gemfile.lock index 0414f2484c458..303840bd6b834 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -136,9 +136,9 @@ GEM msgpack (~> 1.0) brakeman (5.0.0) browser (5.3.1) - brpoplpush-redis_script (0.1.2) + brpoplpush-redis_script (0.1.3) concurrent-ruby (~> 1.0, >= 1.0.5) - redis (>= 1.0, <= 5.0) + redis (>= 1.0, < 6) buftok (0.2.0) builder (3.2.4) bullet (6.1.4) @@ -183,8 +183,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.8) - connection_pool (2.2.3) + concurrent-ruby (1.1.10) + connection_pool (2.3.0) counter_culture (2.8.0) activerecord (>= 4.2) activesupport (>= 4.2) @@ -466,9 +466,9 @@ GEM http-2 (~> 0.11) netrc (0.11.0) nio4r (2.5.7) - nokogiri (1.11.3-x86_64-darwin) + nokogiri (1.13.9-x86_64-darwin) racc (~> 1.4) - nokogiri (1.11.3-x86_64-linux) + nokogiri (1.13.9-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -541,8 +541,8 @@ GEM rest-client (~> 2.0, >= 2.0.2) pusher-signature (0.1.8) raabro (1.4.0) - racc (1.5.2) - 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) @@ -735,11 +735,12 @@ GEM sidekiq-cron (1.2.0) fugit (~> 1.1) sidekiq (>= 4.2.1) - sidekiq-unique-jobs (7.0.7) + sidekiq-unique-jobs (7.1.29) brpoplpush-redis_script (> 0.1.1, <= 2.0.0) concurrent-ruby (~> 1.0, >= 1.0.5) + redis (< 5.0) sidekiq (>= 5.0, < 7.0) - thor (>= 0.20, < 2.0) + thor (>= 0.20, < 3.0) simple_oauth (0.3.1) simplecov (0.21.2) docile (~> 1.1) @@ -777,7 +778,7 @@ GEM strong_migrations (0.7.6) activerecord (>= 5) test-prof (1.0.2) - thor (1.1.0) + thor (1.2.1) thread_safe (0.3.6) tilt (2.0.10) timecop (0.9.4) @@ -976,7 +977,7 @@ DEPENDENCIES shoulda-matchers (~> 4.5.1) sidekiq (~> 6.2.1) sidekiq-cron (~> 1.1) - sidekiq-unique-jobs (~> 7.0.7) + sidekiq-unique-jobs (~> 7.1.29) simplecov (~> 0.21.2) sitemap_generator (~> 6.1) slack-notifier (~> 2.3) diff --git a/vendor/cache/brpoplpush-redis_script-0.1.2.gem b/vendor/cache/brpoplpush-redis_script-0.1.2.gem deleted file mode 100644 index 8d43da2a6a3bc..0000000000000 Binary files a/vendor/cache/brpoplpush-redis_script-0.1.2.gem and /dev/null differ diff --git a/vendor/cache/brpoplpush-redis_script-0.1.3.gem b/vendor/cache/brpoplpush-redis_script-0.1.3.gem new file mode 100644 index 0000000000000..5bab1618ab946 Binary files /dev/null and b/vendor/cache/brpoplpush-redis_script-0.1.3.gem differ diff --git a/vendor/cache/concurrent-ruby-1.1.10.gem b/vendor/cache/concurrent-ruby-1.1.10.gem new file mode 100644 index 0000000000000..c796701bee261 Binary files /dev/null and b/vendor/cache/concurrent-ruby-1.1.10.gem differ diff --git a/vendor/cache/concurrent-ruby-1.1.8.gem b/vendor/cache/concurrent-ruby-1.1.8.gem deleted file mode 100644 index 40b30f3f5fa88..0000000000000 Binary files a/vendor/cache/concurrent-ruby-1.1.8.gem and /dev/null differ diff --git a/vendor/cache/connection_pool-2.2.3.gem b/vendor/cache/connection_pool-2.2.3.gem deleted file mode 100644 index 9d89e9d98ddf0..0000000000000 Binary files a/vendor/cache/connection_pool-2.2.3.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/nokogiri-1.11.3-arm64-darwin.gem b/vendor/cache/nokogiri-1.11.3-arm64-darwin.gem deleted file mode 100644 index d0fc46b4757eb..0000000000000 Binary files a/vendor/cache/nokogiri-1.11.3-arm64-darwin.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.11.3-x86_64-darwin.gem b/vendor/cache/nokogiri-1.11.3-x86_64-darwin.gem deleted file mode 100644 index d75c3c847248b..0000000000000 Binary files a/vendor/cache/nokogiri-1.11.3-x86_64-darwin.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.11.3-x86_64-linux.gem b/vendor/cache/nokogiri-1.11.3-x86_64-linux.gem deleted file mode 100644 index 8cdddb704280a..0000000000000 Binary files a/vendor/cache/nokogiri-1.11.3-x86_64-linux.gem and /dev/null 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/racc-1.5.2.gem b/vendor/cache/racc-1.5.2.gem deleted file mode 100644 index 39f03fa79c387..0000000000000 Binary files a/vendor/cache/racc-1.5.2.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/sidekiq-unique-jobs-7.0.7.gem b/vendor/cache/sidekiq-unique-jobs-7.0.7.gem deleted file mode 100644 index a58a787aea5b7..0000000000000 Binary files a/vendor/cache/sidekiq-unique-jobs-7.0.7.gem and /dev/null differ diff --git a/vendor/cache/sidekiq-unique-jobs-7.1.29.gem b/vendor/cache/sidekiq-unique-jobs-7.1.29.gem new file mode 100644 index 0000000000000..d9b25d5c8baf3 Binary files /dev/null and b/vendor/cache/sidekiq-unique-jobs-7.1.29.gem differ diff --git a/vendor/cache/thor-1.1.0.gem b/vendor/cache/thor-1.1.0.gem deleted file mode 100644 index 2677414cc6185..0000000000000 Binary files a/vendor/cache/thor-1.1.0.gem and /dev/null differ diff --git a/vendor/cache/thor-1.2.1.gem b/vendor/cache/thor-1.2.1.gem new file mode 100644 index 0000000000000..d7e14e1f945d3 Binary files /dev/null and b/vendor/cache/thor-1.2.1.gem differ