Merge branch '7496-ruby-3.1' into 7497-ruby-3.2

.github/workflows/ci.yml

@@ -24,8 +24,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - { ruby: 2.7, postgres: 13.5 }
-        - { ruby: 2.7, postgres: 13.5, gemfile: 'Gemfile.rails_next' }
+        - { ruby: '3.0', postgres: 13.5 }
+        - { ruby: '3.0', postgres: 13.5, gemfile: 'Gemfile.rails_next' }
+        - { ruby: '3.1', postgres: 13.5 }
+        - { ruby: '3.1', postgres: 13.5, gemfile: 'Gemfile.rails_next' }
 
     services:
       postgres:

.github/workflows/rubocop.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Install Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.0
 
     - name: Run RuboCop linter
       uses: reviewdog/action-rubocop@v1

.ruby-style.yml

@@ -4,7 +4,7 @@ require:
   - rubocop-rails
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   RubyInterpreters:
     - ruby
     - rake

.ruby-version.example

@@ -1 +1 @@
-2.7.4
+3.0.4

Gemfile

@@ -81,19 +81,16 @@ source 'https://rubygems.org'
 
 # See instructions in Gemfile.rails_next
 def rails_upgrade?
-  %w[1 true].include?(ENV['RAILS_UPGRADE'])
+  true
 end
 
-if rails_upgrade?
-  gem 'rails', '~> 7.0.4'
-else
-  gem 'rails', '~> 6.1.7'
-end
+gem 'rails', '~> 7.0.4'
 
 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 'acts_as_versioned', git: 'https://github.com/mysociety/acts_as_versioned.git',
+                         ref: '13e928b'
 gem 'active_model_otp'
 gem 'bcrypt', '~> 3.1.18'
 gem 'cancancan', '~> 3.4.0'
@@ -123,18 +120,14 @@ gem 'ruby-msg', '~> 1.5.0', :git => 'https://github.com/mysociety/ruby-msg.git',
 gem 'rubyzip', '~> 2.3.2'
 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 '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.1'
 gem 'vpim', '~> 13.11.11'
 gem 'will_paginate', '~> 3.3.1'
-gem 'xapian-full-alaveteli', '~> 1.4.18.1'
+gem 'xapian-full-alaveteli', '~> 1.4.21.1'
 gem 'xml-simple', '~> 1.1.9', :require => 'xmlsimple'
 gem 'zip_tricks', '~> 5.6.0'
 
@@ -171,20 +164,15 @@ gem 'aws-sdk-s3', require: false
 gem 'azure-storage', require: false
 gem 'google-cloud-storage', '~> 1.43', require: false
 
-if rails_upgrade? && RUBY_VERSION < '3.1'
-  gem 'net-http', '0.1.1'
-  gem 'uri', '0.10.0'
-end
-
 group :test do
   gem 'fivemat', '~> 1.3.7'
   gem 'webmock', '~> 3.18.1'
   gem 'simplecov', '~> 0.17.1'
   gem 'simplecov-lcov', '~> 0.7.0'
   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')
+                          ref: '6ceea96'
+  gem 'rails-controller-testing'
 end
 
 group :test, :development do
@@ -194,7 +182,6 @@ group :test, :development do
   gem 'rspec-activemodel-mocks', '~> 1.1.0'
   gem 'rspec-rails', '~> 6.0.0'
   gem 'pry', '~> 0.14.1'
-  gem 'pry-byebug', '~> 3.10.1'
 end
 
 group :development do