Merge branch 'release/0.42.0.0'

.ruby-style.yml

@@ -244,7 +244,7 @@ Layout/LineLength:
   Enabled: true
   Max: 80
   IgnoreCopDirectives: false
-  IgnoredPatterns:
+  AllowedPatterns:
     - "^\\s*it\\s+.*do$"
     - "^\\s*context\\s+.*do$"
     - "^\\s*describe\\s+.*do$"
@@ -288,6 +288,9 @@ Layout/MultilineMethodCallIndentation:
 Layout/MultilineMethodDefinitionBraceLayout:
   Enabled: true
 
+Layout/MultilineMethodParameterLineBreaks:
+  Enabled: false
+
 Layout/MultilineOperationIndentation:
   Enabled: true
 
@@ -458,6 +461,9 @@ Lint/DuplicateElsifCondition:
 Lint/DuplicateHashKey:
   Enabled: true
 
+Lint/DuplicateMagicComment:
+  Enabled: false
+
 Lint/DuplicateMethods:
   Enabled: true
 
@@ -656,6 +662,9 @@ Lint/RegexpAsCondition:
 Lint/RequireParentheses:
   Enabled: true
 
+Lint/RequireRangeParentheses:
+  Enabled: false
+
 Lint/RequireRelativeSelfPath:
   Enabled: false
 
@@ -866,6 +875,9 @@ Naming/VariableName:
 Naming/VariableNumber:
   Enabled: false
 
+Performance:
+  Enabled: false
+
 #################### Performance ####################
 
 Performance/AncestorsInclude:
@@ -1015,14 +1027,23 @@ Performance/UnfreezeString:
 Performance/UriDefaultParser:
   Enabled: false
 
+Rails:
+  Enabled: false
+
 #################### Rails ####################
 
+Rails/ActionControllerFlashBeforeRender:
+  Enabled: false
+
 Rails/ActionControllerTestCase:
   Enabled: false
 
 Rails/ActionFilter:
   Enabled: false
 
+Rails/ActionOrder:
+  Enabled: false
+
 Rails/ActiveRecordAliases:
   Enabled: false
 
@@ -1035,6 +1056,9 @@ Rails/ActiveRecordOverride:
 Rails/ActiveSupportAliases:
   Enabled: false
 
+Rails/ActiveSupportOnLoad:
+  Enabled: false
+
 Rails/AddColumnIndex:
   Enabled: false
 
@@ -1143,6 +1167,9 @@ Rails/FindById:
 Rails/FindEach:
   Enabled: false
 
+Rails/FreezeTime:
+  Enabled: false
+
 Rails/HasAndBelongsToMany:
   Enabled: false
 
@@ -1167,6 +1194,9 @@ Rails/I18nLocaleAssignment:
 Rails/I18nLocaleTexts:
   Enabled: false
 
+Rails/IgnoredColumnsAssignment:
+  Enabled: false
+
 Rails/IgnoredSkipActionFilterOption:
   Enabled: false
 
@@ -1284,6 +1314,9 @@ Rails/ReversibleMigrationMethodDefinition:
 Rails/RootJoinChain:
   Enabled: false
 
+Rails/RootPathnameMethods:
+  Enabled: false
+
 Rails/RootPublicPath:
   Enabled: false
 
@@ -1326,6 +1359,12 @@ Rails/TimeZoneAssignment:
 Rails/ToFormattedS:
   Enabled: false
 
+Rails/ToSWithArgument:
+  Enabled: false
+
+Rails/TopLevelHashWithIndifferentAccess:
+  Enabled: false
+
 Rails/TransactionExitStatement:
   Enabled: false
 
@@ -1350,9 +1389,15 @@ Rails/WhereEquals:
 Rails/WhereExists:
   Enabled: false
 
+Rails/WhereMissing:
+  Enabled: false
+
 Rails/WhereNot:
   Enabled: false
 
+Rails/WhereNotWithMultipleConditions:
+  Enabled: false
+
 #################### Security ####################
 
 Security/CompoundHash:
@@ -1531,6 +1576,9 @@ Style/EmptyCaseCondition:
 Style/EmptyElse:
   Enabled: true
 
+Style/EmptyHeredoc:
+  Enabled: false
+
 Style/EmptyLambdaParameter:
   Enabled: false
 
@@ -1676,6 +1724,9 @@ Style/LambdaCall:
 Style/LineEndConcatenation:
   Enabled: true
 
+Style/MagicCommentFormat:
+  Enabled: false
+
 Style/MapCompactWithConditionalBlock:
   Enabled: false
 
@@ -1805,6 +1856,9 @@ Style/OneLineConditional:
 Style/OpenStructUse:
   Enabled: false
 
+Style/OperatorMethodCall:
+  Enabled: false
+
 Style/OptionHash:
   Enabled: false
 
@@ -1913,6 +1967,9 @@ Style/RedundantSort:
 Style/RedundantSortBy:
   Enabled: false
 
+Style/RedundantStringEscape:
+  Enabled: false
+
 Style/RegexpLiteral:
   Enabled: false
 

Gemfile

@@ -85,50 +85,51 @@ def rails_upgrade?
 end
 
 if rails_upgrade?
-  gem 'rails', '~> 7.0.3'
+  gem 'rails', '~> 7.0.4'
 else
-  gem 'rails', '~> 6.1.6'
+  gem 'rails', '~> 6.1.7'
 end
 
-gem 'pg', '~> 1.4.1'
+gem 'pg', '~> 1.4.4'
 
 # New gem releases aren't being done. master is newer and supports Rails > 3.0
 gem 'acts_as_versioned', :git => 'https://github.com/technoweenie/acts_as_versioned.git', :ref => '63b1fc8529d028'
 gem 'active_model_otp'
 gem 'bcrypt', '~> 3.1.18'
 gem 'cancancan', '~> 3.4.0'
 gem 'charlock_holmes', '~> 0.7.7'
-gem 'dalli', '~> 3.2.2'
+gem 'dalli', '~> 3.2.3'
 gem 'exception_notification', '~> 4.5.0'
 gem 'fancybox-rails', '~> 0.3.0'
 gem 'gnuplot', '~> 2.6.0'
 gem 'htmlentities', '~> 4.3.0'
-gem 'icalendar', '~> 2.7.1'
+gem 'icalendar', '~> 2.8.0'
 gem 'jquery-rails', '~> 4.5.0'
 gem 'jquery-ui-rails', '~> 6.0.0'
 gem 'json', '~> 2.6.2'
-gem 'holidays', '~> 8.5.0'
+gem 'holidays', '~> 8.6.0'
 gem 'iso_country_codes', '~> 0.7.8'
 gem 'mail', '~> 2.7.1'
 gem 'maxmind-db', '~> 1.0.0'
 gem 'mahoro', '~> 0.5'
-gem 'nokogiri', '~> 1.13.6'
+gem 'nokogiri', '~> 1.13.10'
 gem 'open4', '~> 1.3.0'
 gem 'rack', '~> 2.2.4'
 gem 'rack-utf8_sanitizer', '~> 1.7.0'
-gem 'recaptcha', '~> 5.10.0', require: 'recaptcha/rails'
+gem 'recaptcha', '~> 5.12.3', require: 'recaptcha/rails'
 gem 'mini_magick', '~> 4.11.0'
 gem 'rolify', '~> 5.3.0'
 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.3.4'
+gem 'secure_headers', '~> 6.4.0'
 gem 'statistics2', '~> 0.54'
 if rails_upgrade?
   gem 'strip_attributes', :git => 'https://github.com/mysociety/strip_attributes.git', :branch => 'globalize3-rails7'
 else
   gem 'strip_attributes', :git => 'https://github.com/mysociety/strip_attributes.git', :branch => 'globalize3-rails5.2'
 end
 gem 'stripe', '~> 5.55.0'
+gem 'syck', '~> 1.4.1', require: false
 gem 'syslog_protocol', '~> 0.9.0'
 gem 'thin', '~> 1.8.1'
 gem 'vpim', '~> 13.11.11'
@@ -141,9 +142,9 @@ gem 'zip_tricks', '~> 5.6.0'
 gem 'gender_detector', '~> 2.0.0'
 
 # Gems related to internationalisation
-gem 'i18n', '~> 1.10.0'
+gem 'i18n', '~> 1.12.0'
 gem 'rails-i18n', '~> 7.0.5'
-gem 'gettext_i18n_rails', '~> 1.8.1'
+gem 'gettext_i18n_rails', '~> 1.9.0'
   gem 'fast_gettext', '~> 2.2.0'
 gem 'gettext', '~> 3.4.3'
 gem 'globalize', '~> 6.2.1'
@@ -158,7 +159,7 @@ gem 'mime-types', '< 3.0.0', require: false
 
 # Assets
 gem 'bootstrap-sass', '~> 2.3.2.2'
-gem 'mini_racer', '~> 0.6.2'
+gem 'mini_racer', '~> 0.6.3'
 gem 'sass-rails', '~> 5.0.8'
 gem 'uglifier', '~> 4.2.0'
 
@@ -168,7 +169,7 @@ gem 'alaveteli_features', :path => 'gems/alaveteli_features'
 # Storage backends
 gem 'aws-sdk-s3', require: false
 gem 'azure-storage', require: false
-gem 'google-cloud-storage', '~> 1.37', require: false
+gem 'google-cloud-storage', '~> 1.43', require: false
 
 if rails_upgrade? && RUBY_VERSION < '3.1'
   gem 'net-http', '0.1.1'
@@ -177,34 +178,34 @@ end
 
 group :test do
   gem 'fivemat', '~> 1.3.7'
-  gem 'webmock', '~> 3.14.0'
+  gem 'webmock', '~> 3.18.1'
   gem 'simplecov', '~> 0.17.1'
   gem 'simplecov-lcov', '~> 0.7.0'
-  gem 'capybara', '~> 3.37.1'
+  gem 'capybara', '~> 3.38.0'
   gem 'stripe-ruby-mock', git: 'https://github.com/stripe-ruby-mock/stripe-ruby-mock',
                           ref: '2c925fd'
   gem('rails-controller-testing')
 end
 
 group :test, :development do
-  gem 'bullet', '~> 7.0.2'
+  gem 'bullet', '~> 7.0.4'
   gem 'factory_bot_rails', '~> 6.2.0'
   gem 'oink', '~> 0.10.1'
   gem 'rspec-activemodel-mocks', '~> 1.1.0'
-  gem 'rspec-rails', '~> 5.1.2'
-  gem 'pry', '~> 0.13.0'
-  gem 'pry-byebug', '~> 3.9.0'
+  gem 'rspec-rails', '~> 6.0.0'
+  gem 'pry', '~> 0.14.1'
+  gem 'pry-byebug', '~> 3.10.1'
 end
 
 group :development do
   gem 'annotate', '< 3.2.1'
   gem 'capistrano', '~> 2.15.0', '< 3.0.0'
-    gem 'net-ssh', '~> 6.1.0'
+    gem 'net-ssh', '~> 7.0.1'
       gem 'net-ssh-gateway', '>= 1.1.0', '< 3.0.0'
   gem 'launchy', '< 2.5.0'
   gem 'listen', '>= 3.0.5', '< 3.7.2'
   gem 'web-console', '>= 3.3.0'
-  gem 'rubocop', '~> 1.31.1', require: false
+  gem 'rubocop', '~> 1.37.0', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
 end