diff --git a/Gemfile b/Gemfile index 4ac68694cd136..f0d7b96cc9ca0 100644 --- a/Gemfile +++ b/Gemfile @@ -98,7 +98,7 @@ gem "s3_direct_upload", "~> 0.1" # Direct Upload to Amazon S3 gem "sassc-rails", "~> 2.1.2" # Integrate SassC-Ruby into Rails gem "sidekiq", "~> 6.1.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", "~> 6.0.25" # Ensures that Sidekiq jobs are unique when enqueued +gem "sidekiq-unique-jobs", "~> 7.1.27" # 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 8fbfaf2a5de71..a60ced4f89169 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,6 +135,9 @@ GEM msgpack (~> 1.0) brakeman (4.10.1) browser (5.2.0) + brpoplpush-redis_script (0.1.2) + concurrent-ruby (~> 1.0, >= 1.0.5) + redis (>= 1.0, <= 5.0) buffer (0.1.3) addressable environs @@ -191,8 +194,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.7) - connection_pool (2.2.3) + concurrent-ruby (1.1.10) + connection_pool (2.2.5) counter_culture (2.7.0) activerecord (>= 4.2) activesupport (>= 4.2) @@ -543,7 +546,7 @@ GEM pusher-signature (0.1.8) raabro (1.4.0) racc (1.5.2) - rack (2.2.3) + rack (2.2.4) rack-attack (6.3.1) rack (>= 1.0, < 3) rack-cors (1.1.1) @@ -721,10 +724,11 @@ GEM sidekiq-cron (1.2.0) fugit (~> 1.1) sidekiq (>= 4.2.1) - sidekiq-unique-jobs (6.0.25) + sidekiq-unique-jobs (7.1.27) + brpoplpush-redis_script (> 0.1.1, <= 2.0.0) concurrent-ruby (~> 1.0, >= 1.0.5) - sidekiq (>= 4.0, < 7.0) - thor (>= 0.20, < 2.0) + sidekiq (>= 5.0, < 8.0) + thor (>= 0.20, < 3.0) simple_oauth (0.3.1) simplecov (0.21.2) docile (~> 1.1) @@ -964,7 +968,7 @@ DEPENDENCIES shoulda-matchers (~> 4.5.0) sidekiq (~> 6.1.2) sidekiq-cron (~> 1.1) - sidekiq-unique-jobs (~> 6.0.25) + sidekiq-unique-jobs (~> 7.1.27) 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 new file mode 100644 index 0000000000000..8d43da2a6a3bc Binary files /dev/null and b/vendor/cache/brpoplpush-redis_script-0.1.2.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.7.gem b/vendor/cache/concurrent-ruby-1.1.7.gem deleted file mode 100644 index ae9b3702ae66b..0000000000000 Binary files a/vendor/cache/concurrent-ruby-1.1.7.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.2.5.gem b/vendor/cache/connection_pool-2.2.5.gem new file mode 100644 index 0000000000000..923bb40c3c20e Binary files /dev/null and b/vendor/cache/connection_pool-2.2.5.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-6.0.25.gem b/vendor/cache/sidekiq-unique-jobs-6.0.25.gem deleted file mode 100644 index 9e0d41ba1732e..0000000000000 Binary files a/vendor/cache/sidekiq-unique-jobs-6.0.25.gem and /dev/null differ diff --git a/vendor/cache/sidekiq-unique-jobs-7.1.27.gem b/vendor/cache/sidekiq-unique-jobs-7.1.27.gem new file mode 100644 index 0000000000000..c230139db8db8 Binary files /dev/null and b/vendor/cache/sidekiq-unique-jobs-7.1.27.gem differ