diff --git a/Gemfile b/Gemfile index 4ac68694cd136..5a8034b2ebcac 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.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 8fbfaf2a5de71..e62576c8b47f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,7 +100,7 @@ GEM approvals (0.0.24) nokogiri (~> 1.6) thor (~> 0.18) - ast (2.4.1) + ast (2.4.2) aws-eventstream (1.1.0) aws-sigv4 (1.2.2) aws-eventstream (~> 1, >= 1.0.2) @@ -135,6 +135,9 @@ GEM msgpack (~> 1.0) brakeman (4.10.1) browser (5.2.0) + brpoplpush-redis_script (0.1.3) + concurrent-ruby (~> 1.0, >= 1.0.5) + redis (>= 1.0, < 6) 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.3.0) counter_culture (2.7.0) activerecord (>= 4.2) activesupport (>= 4.2) @@ -295,7 +298,7 @@ GEM browser (>= 2.0) distribution railties (>= 5) - fix-db-schema-conflicts (3.0.3) + fix-db-schema-conflicts (3.1.0) rubocop (>= 0.38.0) flipper (0.20.3) flipper-active_record (0.20.3) @@ -457,7 +460,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.11.0) mini_mime (1.0.2) - mini_portile2 (2.5.0) + mini_portile2 (2.8.0) mini_racer (0.3.1) libv8 (~> 8.4.255) minitest (5.14.3) @@ -470,12 +473,12 @@ GEM nenv (0.3.0) netrc (0.11.0) nio4r (2.5.4) - nokogiri (1.11.1) - mini_portile2 (~> 2.5.0) + nokogiri (1.13.10) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.11.1-x86_64-darwin) + nokogiri (1.13.10-x86_64-darwin) racc (~> 1.4) - nokogiri (1.11.1-x86_64-linux) + nokogiri (1.13.10-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -513,7 +516,7 @@ GEM rack orm_adapter (0.5.0) parallel (1.20.1) - parser (3.0.0.0) + parser (3.1.3.0) ast (~> 2.4.1) patron (0.13.3) pg (1.2.3) @@ -542,8 +545,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.3.1) rack (>= 1.0, < 3) rack-cors (1.1.1) @@ -585,7 +588,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.3) ransack (2.4.1) activerecord (>= 5.2.4) @@ -627,7 +630,7 @@ GEM netrc (~> 0.8) reverse_markdown (2.0.0) nokogiri - rexml (3.2.4) + rexml (3.2.5) rolify (5.3.0) rouge (3.26.0) rspec (3.10.0) @@ -662,8 +665,8 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.4.0) - parser (>= 2.7.1.5) + rubocop-ast (1.24.0) + parser (>= 3.1.1.0) rubocop-performance (1.9.2) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -721,10 +724,12 @@ GEM sidekiq-cron (1.2.0) fugit (~> 1.1) sidekiq (>= 4.2.1) - sidekiq-unique-jobs (6.0.25) + sidekiq-unique-jobs (7.1.29) + 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) + redis (< 5.0) + sidekiq (>= 5.0, < 7.0) + thor (>= 0.20, < 3.0) simple_oauth (0.3.1) simplecov (0.21.2) docile (~> 1.1) @@ -788,7 +793,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (2.0.0) + unicode-display_width (2.3.0) uniform_notifier (1.13.0) validate_url (1.0.13) activemodel (>= 3.0.0) @@ -964,7 +969,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.29) simplecov (~> 0.21.2) sitemap_generator (~> 6.1) slack-notifier (~> 2.3) diff --git a/vendor/cache/ast-2.4.1.gem b/vendor/cache/ast-2.4.1.gem deleted file mode 100644 index 01617aad96bd8..0000000000000 Binary files a/vendor/cache/ast-2.4.1.gem and /dev/null differ diff --git a/vendor/cache/ast-2.4.2.gem b/vendor/cache/ast-2.4.2.gem new file mode 100644 index 0000000000000..abe1643657c26 Binary files /dev/null and b/vendor/cache/ast-2.4.2.gem 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.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.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/fix-db-schema-conflicts-3.0.3.gem b/vendor/cache/fix-db-schema-conflicts-3.0.3.gem deleted file mode 100644 index 1b360dff9c8b3..0000000000000 Binary files a/vendor/cache/fix-db-schema-conflicts-3.0.3.gem and /dev/null differ diff --git a/vendor/cache/fix-db-schema-conflicts-3.1.0.gem b/vendor/cache/fix-db-schema-conflicts-3.1.0.gem new file mode 100644 index 0000000000000..d23cc2573beb9 Binary files /dev/null and b/vendor/cache/fix-db-schema-conflicts-3.1.0.gem differ diff --git a/vendor/cache/mini_portile2-2.5.0.gem b/vendor/cache/mini_portile2-2.5.0.gem deleted file mode 100644 index cd8b4aa0f954e..0000000000000 Binary files a/vendor/cache/mini_portile2-2.5.0.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.11.1-x86_64-darwin.gem b/vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem deleted file mode 100644 index 2d8c028c2351a..0000000000000 Binary files a/vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.11.1-x86_64-linux.gem b/vendor/cache/nokogiri-1.11.1-x86_64-linux.gem deleted file mode 100644 index e03cbd3fb5379..0000000000000 Binary files a/vendor/cache/nokogiri-1.11.1-x86_64-linux.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.11.1.gem b/vendor/cache/nokogiri-1.11.1.gem deleted file mode 100644 index 0233e904c46d6..0000000000000 Binary files a/vendor/cache/nokogiri-1.11.1.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.13.10-x86_64-darwin.gem b/vendor/cache/nokogiri-1.13.10-x86_64-darwin.gem new file mode 100644 index 0000000000000..3670382e0d17b Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10-x86_64-darwin.gem differ diff --git a/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem b/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem new file mode 100644 index 0000000000000..8a7f2b6ad0e5d Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem differ diff --git a/vendor/cache/nokogiri-1.13.10.gem b/vendor/cache/nokogiri-1.13.10.gem new file mode 100644 index 0000000000000..25012e35bb033 Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10.gem differ diff --git a/vendor/cache/parser-3.0.0.0.gem b/vendor/cache/parser-3.0.0.0.gem deleted file mode 100644 index f542329d6c138..0000000000000 Binary files a/vendor/cache/parser-3.0.0.0.gem and /dev/null differ diff --git a/vendor/cache/parser-3.1.3.0.gem b/vendor/cache/parser-3.1.3.0.gem new file mode 100644 index 0000000000000..26ea6f0f3b1e0 Binary files /dev/null and b/vendor/cache/parser-3.1.3.0.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/rainbow-3.0.0.gem b/vendor/cache/rainbow-3.0.0.gem deleted file mode 100644 index c53caf7afa806..0000000000000 Binary files a/vendor/cache/rainbow-3.0.0.gem and /dev/null differ diff --git a/vendor/cache/rainbow-3.1.1.gem b/vendor/cache/rainbow-3.1.1.gem new file mode 100644 index 0000000000000..863181a2e77bc Binary files /dev/null and b/vendor/cache/rainbow-3.1.1.gem differ diff --git a/vendor/cache/rexml-3.2.4.gem b/vendor/cache/rexml-3.2.4.gem deleted file mode 100644 index 95bedb1d8e92a..0000000000000 Binary files a/vendor/cache/rexml-3.2.4.gem and /dev/null differ diff --git a/vendor/cache/rexml-3.2.5.gem b/vendor/cache/rexml-3.2.5.gem new file mode 100644 index 0000000000000..5680fec4c6a6c Binary files /dev/null and b/vendor/cache/rexml-3.2.5.gem differ diff --git a/vendor/cache/rubocop-ast-1.24.0.gem b/vendor/cache/rubocop-ast-1.24.0.gem new file mode 100644 index 0000000000000..04230d1846898 Binary files /dev/null and b/vendor/cache/rubocop-ast-1.24.0.gem differ diff --git a/vendor/cache/rubocop-ast-1.4.0.gem b/vendor/cache/rubocop-ast-1.4.0.gem deleted file mode 100644 index b7221b82d4698..0000000000000 Binary files a/vendor/cache/rubocop-ast-1.4.0.gem and /dev/null 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.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/unicode-display_width-2.0.0.gem b/vendor/cache/unicode-display_width-2.0.0.gem deleted file mode 100644 index f1ecf92012ff0..0000000000000 Binary files a/vendor/cache/unicode-display_width-2.0.0.gem and /dev/null differ diff --git a/vendor/cache/unicode-display_width-2.3.0.gem b/vendor/cache/unicode-display_width-2.3.0.gem new file mode 100644 index 0000000000000..c8551a4fdf1f8 Binary files /dev/null and b/vendor/cache/unicode-display_width-2.3.0.gem differ