Merge branch 'release/0.44.0.0'

Author: gbp

.gitignore

@@ -18,6 +18,7 @@
 /config/memcached.yml
 /config/newrelic.yml
 /config/rails_env.rb
+/config/sidekiq.yml
 /config/storage.yml
 /config/user_spam_scorer.yml
 /config/xapian.yml

.ruby-style.yml

@@ -37,6 +37,9 @@ AllCops:
 Bundler/DuplicatedGem:
   Enabled: false
 
+Bundler/DuplicatedGroup:
+  Enabled: false
+
 Bundler/GemComment:
   Enabled: false
 
@@ -255,6 +258,7 @@ Layout/LineLength:
     - "^\\s*it\\s+.*do$"
     - "^\\s*context\\s+.*do$"
     - "^\\s*describe\\s+.*do$"
+    - "^RSpec\\.describe(\\s+|\\().*do$"
     - "^\\s*class\\s+[A-Z].*<.*"
   Exclude:
     - bin/setup
@@ -579,6 +583,9 @@ Lint/MissingCopEnableDirective:
 Lint/MissingSuper:
   Enabled: false
 
+Lint/MixedCaseRange:
+  Enabled: false
+
 Lint/MixedRegexpCaptureTypes:
   Enabled: false
 
@@ -645,6 +652,9 @@ Lint/RedundantCopEnableDirective:
 Lint/RedundantDirGlobSort:
   Enabled: false
 
+Lint/RedundantRegexpQuantifiers:
+  Enabled: false
+
 Lint/RedundantRequireStatement:
   Enabled: false
 
@@ -968,6 +978,9 @@ Performance/IoReadlines:
 Performance/MapCompact:
   Enabled: false
 
+Performance/MapMethodChain:
+  Enabled: false
+
 Performance/MethodObjectAsBlock:
   Enabled: false
 
@@ -1120,6 +1133,9 @@ Rails/ContentTag:
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
+Rails/DangerousColumnNames:
+  Enabled: false
+
 Rails/Date:
   Enabled: false
 
@@ -1285,6 +1301,9 @@ Rails/RakeEnvironment:
 Rails/ReadWriteAttribute:
   Enabled: false
 
+Rails/RedundantActiveRecordAllMethod:
+  Enabled: false
+
 Rails/RedundantAllowNil:
   Enabled: false
 
@@ -1354,6 +1373,9 @@ Rails/SchemaComment:
 Rails/ScopeArgs:
   Enabled: false
 
+Rails/SelectMap:
+  Enabled: false
+
 Rails/ShortI18n:
   Enabled: false
 
@@ -1402,6 +1424,9 @@ Rails/UnknownEnv:
 Rails/UnusedIgnoredColumns:
   Enabled: false
 
+Rails/UnusedRenderContent:
+  Enabled: false
+
 Rails/Validation:
   Enabled: false
 
@@ -1643,6 +1668,9 @@ Style/EvalWithLocation:
 Style/EvenOdd:
   Enabled: true
 
+Style/ExactRegexpMatch:
+  Enabled: false
+
 Style/ExpandPathArguments:
   Enabled: false
 
@@ -1953,6 +1981,9 @@ Style/RandomWithOffset:
 Style/RedundantArgument:
   Enabled: false
 
+Style/RedundantArrayConstructor:
+  Enabled: false
+
 Style/RedundantAssignment:
   Enabled: false
 
@@ -1971,6 +2002,9 @@ Style/RedundantConditional:
 Style/RedundantConstantBase:
   Enabled: false
 
+Style/RedundantCurrentDirectoryInPath:
+  Enabled: false
+
 Style/RedundantDoubleSplatHashBraces:
   Enabled: false
 
@@ -1986,6 +2020,9 @@ Style/RedundantFetchBlock:
 Style/RedundantFileExtensionInRequire:
   Enabled: false
 
+Style/RedundantFilterChain:
+  Enabled: false
+
 Style/RedundantFreeze:
   Enabled: true
 
@@ -2007,9 +2044,15 @@ Style/RedundantParentheses:
 Style/RedundantPercentQ:
   Enabled: false
 
+Style/RedundantRegexpArgument:
+  Enabled: false
+
 Style/RedundantRegexpCharacterClass:
   Enabled: false
 
+Style/RedundantRegexpConstructor:
+  Enabled: false
+
 Style/RedundantRegexpEscape:
   Enabled: false
 
@@ -2049,6 +2092,9 @@ Style/RescueStandardError:
 Style/ReturnNil:
   Enabled: false
 
+Style/ReturnNilInPredicateMethodDefinition:
+  Enabled: false
+
 Style/SafeNavigation:
   Enabled: false
 
@@ -2077,6 +2123,9 @@ Style/SingleArgumentDig:
 Style/SingleLineBlockParams:
   Enabled: false
 
+Style/SingleLineDoEndBlock:
+  Enabled: false
+
 Style/SingleLineMethods:
   Enabled: true
 
@@ -2206,6 +2255,9 @@ Style/WhileUntilModifier:
 Style/WordArray:
   Enabled: true
 
+Style/YAMLFileRead:
+  Enabled: false
+
 Style/YodaCondition:
   Enabled: false
 

.vagrant.yml.example

@@ -79,52 +79,56 @@
 # the new version. It is always preferable to upgrade our code.
 source 'https://rubygems.org'
 
-gem 'rails', '~> 7.0.4'
+gem 'rails', '~> 7.0.8'
 
-gem 'pg', '~> 1.4.6'
+gem 'pg', '~> 1.5.4'
 
 # New gem releases aren't being done. master is newer and supports Rails > 3.0
 gem 'acts_as_versioned', git: 'https://github.com/mysociety/acts_as_versioned.git',
                          ref: '13e928b'
 gem 'active_model_otp'
-gem 'bcrypt', '~> 3.1.18'
+gem 'bcrypt', '~> 3.1.19'
 gem 'cancancan', '~> 3.5.0'
 gem 'charlock_holmes', '~> 0.7.7'
-gem 'dalli', '~> 3.2.4'
+gem 'dalli', '~> 3.2.6'
 gem 'exception_notification', '~> 4.5.0'
 gem 'fancybox-rails', '~> 0.3.0'
+gem 'friendly_id', '~> 5.5.0'
 gem 'gnuplot', '~> 2.6.0'
 gem 'htmlentities', '~> 4.3.0'
-gem 'icalendar', '~> 2.8.0'
-gem 'jquery-rails', '~> 4.5.1'
+gem 'icalendar', '~> 2.9.0'
+gem 'jquery-rails', '~> 4.6.0'
 gem 'jquery-ui-rails', '~> 6.0.0'
 gem 'json', '~> 2.6.2'
 gem 'holidays', '~> 8.6.0'
 gem 'iso_country_codes', '~> 0.7.8'
 gem 'mail', '~> 2.8.1'
 gem 'maxmind-db', '~> 1.0.0'
 gem 'mahoro', '~> 0.5'
-gem 'nokogiri', '~> 1.14.3'
+gem 'nokogiri', '~> 1.15.4'
 gem 'open4', '~> 1.3.0'
-gem 'rack', '~> 2.2.6'
-gem 'rack-utf8_sanitizer', '~> 1.8.0'
-gem 'recaptcha', '~> 5.14.0', require: 'recaptcha/rails'
+gem 'rack', '~> 2.2.8'
+gem 'rack-utf8_sanitizer', '~> 1.9.1'
+gem 'recaptcha', '~> 5.15.0', require: 'recaptcha/rails'
 gem 'matrix', '~> 0.4.2'
 gem 'mini_magick', '~> 4.12.0'
+gem 'net-protocol', '~> 0.1.3'
+gem 'redcarpet', '~> 3.6.0'
 gem 'redis', '~> 4.8.1'
 gem 'rolify', '~> 6.0.1'
 gem 'ruby-msg', '~> 1.5.0', git: 'https://github.com/mysociety/ruby-msg.git', branch: 'ascii-encoding'
 gem 'rubyzip', '~> 2.3.2'
 gem 'secure_headers', '~> 6.5.0'
-gem 'sidekiq', '~> 6.5.8'
+gem 'sidekiq', '~> 6.5.12'
+gem 'sidekiq-limit_fetch', '~> 4.4.1'
 gem 'statistics2', '~> 0.54'
 gem 'strip_attributes', git: 'https://github.com/mysociety/strip_attributes.git', branch: 'globalize3-rails7'
 gem 'stripe', '~> 5.55.0'
 gem 'syck', '~> 1.4.1', require: false
 gem 'syslog_protocol', '~> 0.9.0'
 gem 'thin', '~> 1.8.2'
 gem 'vpim', '~> 13.11.11'
-gem 'will_paginate', '~> 3.3.1'
+gem 'will_paginate', '~> 4.0.0'
 gem 'xapian-full-alaveteli', '~> 1.4.22.1'
 gem 'xml-simple', '~> 1.1.9', require: 'xmlsimple'
 gem 'zip_tricks', '~> 5.6.0'
@@ -133,11 +137,11 @@ gem 'zip_tricks', '~> 5.6.0'
 gem 'gender_detector', '~> 2.0.0'
 
 # Gems related to internationalisation
-gem 'i18n', '~> 1.12.0'
+gem 'i18n', '~> 1.14.1'
 gem 'rails-i18n', '~> 7.0.5'
-gem 'gettext_i18n_rails', '~> 1.10.0'
+gem 'gettext_i18n_rails', '~> 1.12.0'
   gem 'fast_gettext', '~> 2.3.0'
-gem 'gettext', '~> 3.4.3'
+gem 'gettext', '~> 3.4.7'
 gem 'globalize', '~> 6.2.1'
 gem 'locale', '~> 2.1.3'
 gem 'routing-filter', '~> 0.7.0'
@@ -146,12 +150,13 @@ gem 'unidecoder', '~> 1.1.0'
 gem 'money', '~> 6.16.0'
 
 # mime-types 3.0.0 requires Ruby 2.0.0, and _something_ is trying to update it
-gem 'mime-types', '< 3.0.0', require: false
+gem 'mime-types', '< 4.0.0', require: false
 
 # Assets
 gem 'bootstrap-sass', '~> 2.3.2.2'
-gem 'mini_racer', '~> 0.6.3'
+gem 'mini_racer', '~> 0.8.0'
 gem 'sass-rails', '~> 5.0.8'
+gem 'sprockets', git: 'https://github.com/rails/sprockets', ref: '3.x'
 gem 'uglifier', '~> 4.2.0'
 
 # Feature flags
@@ -164,32 +169,32 @@ gem 'google-cloud-storage', '~> 1.44', require: false
 
 group :test do
   gem 'fivemat', '~> 1.3.7'
-  gem 'webmock', '~> 3.18.1'
+  gem 'webmock', '~> 3.19.1'
   gem 'simplecov', '~> 0.22.0'
   gem 'simplecov-lcov', '~> 0.7.0'
-  gem 'capybara', '~> 3.39.0'
+  gem 'capybara', '~> 3.39.2'
   gem 'stripe-ruby-mock', git: 'https://github.com/stripe-ruby-mock/stripe-ruby-mock',
                           ref: '6ceea96'
   gem 'rails-controller-testing'
 end
 
 group :test, :development do
-  gem 'bullet', '~> 7.0.7'
+  gem 'bullet', '~> 7.1.2'
   gem 'factory_bot_rails', '~> 6.2.0'
   gem 'oink', '~> 0.10.1'
   gem 'rspec-activemodel-mocks', '~> 1.1.0'
-  gem 'rspec-rails', '~> 6.0.0'
+  gem 'rspec-rails', '~> 6.0.3'
   gem 'pry', '~> 0.14.2'
 end
 
 group :development do
   gem 'annotate', '< 3.2.1'
-  gem 'capistrano', '~> 2.15.0', '< 3.0.0'
-    gem 'net-ssh', '~> 7.1.0'
+  gem 'capistrano', '~> 2.15.11'
+    gem 'net-ssh', '~> 7.2.0'
       gem 'net-ssh-gateway', '>= 1.1.0', '< 3.0.0'
   gem 'launchy', '< 2.6.0'
   gem 'web-console', '>= 3.3.0'
-  gem 'rubocop', '~> 1.50.2', require: false
+  gem 'rubocop', '~> 1.57.1', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
 end