Merge upstream

Author: brianjaustin

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,6 @@
 # Pull Request Checklist
 
+<!-- Mark steps in the checklist as complete by changing `[ ]` to `[X]` -->
 * [ ] Have you read ["How to write the perfect pull request"](https://github.blog/2015-01-21-how-to-write-the-perfect-pull-request/)?
 * [ ] Have you read the [contributing guidelines](https://github.com/otwcode/otwarchive/blob/master/CONTRIBUTING.md)?
 * [ ] Have you added [tests for any changed functionality](https://github.com/otwcode/otwarchive/wiki/Automated-Testing)?
@@ -23,9 +24,11 @@ How can the Archive's QA team verify that this is working as you intended?
 If you have a Jira account with access, please update or comment on the issue
 with any new or missing testing instructions instead.
 
+You can remove this section if there are already full testing instructions in the Jira issue.
+
 ## References
 
-Are there other relevant issues/pull requests/mailing list discussions?
+Are there other relevant issues/pull requests/mailing list discussions? If not, you can remove this section.
 
 ## Credit
 

.github/workflows/reviewdog.yml

@@ -45,8 +45,8 @@ jobs:
           bundler-cache: true
 
       - name: erb-lint
-        uses: tk0miya/action-erblint@b6e537f4616e4fa7a9eef209ca34ca944e1440dd
+        uses: tk0miya/action-erblint@44c5fe3552356fe8bff23f30d534aa4258aa3f7b
         with:
           use_bundler: true
           reporter: github-pr-check
-          fail_on_error: true
+          fail_level: any

.rubocop.yml

@@ -83,6 +83,7 @@ Metrics/PerceivedComplexity:
 Migration/LargeTableSchemaUpdate:
   Tables:
     - abuse_reports
+    - active_storage_blobs
     - admin_activities
     - audits
     - bookmarks

.ruby-version

@@ -1 +1 @@
-ruby-3.1.4
+ruby-3.2.7

CONTRIBUTING.md

@@ -42,7 +42,7 @@ Please check out our development wiki for more information on:
 
 ### Workflow
 
-1. If you're a new contributor, find a task on the [issues reserved for first timers](https://otwarchive.atlassian.net/issues/?filter=13119). Otherwise, or if you're up for a challenge, pick a task from the general [open and unassigned issues](https://otwarchive.atlassian.net/issues/?filter=10800). (If you a new contributor, don't worry about claiming the issue for now. If you make a Jira account, you'll get permissions for claiming issues in step 5.)
+1. If you're a new contributor, find a task on the [issues reserved for first timers](https://otwarchive.atlassian.net/issues/?filter=13119). Otherwise, or if you're up for a challenge, pick a task from the general [open and unassigned issues](https://otwarchive.atlassian.net/issues/?filter=10800). (If you're a new contributor, don't worry about claiming the issue for now. If you make a Jira account, you'll get permissions for claiming issues in step 5.)
 2. Write code to address the issue.
 3. Optional: Create a Jira account if you'd like the ability to comment on, assign, and transition issues. Please make sure the Full Name on your Jira account either closely matches the name you'd like us to credit in the release notes or includes it in parentheses, e.g. "Nickname (CREDIT NAME)."
 4. Submit the code with a pull request following the checklist on [our template](https://github.com/otwcode/otwarchive/blob/master/.github/PULL_REQUEST_TEMPLATE.md).

Gemfile

@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
-ruby "3.1.4"
+ruby "~> 3.2.7"
 
 gem 'test-unit', '~> 3.2'
 
 gem 'bundler'
 
-gem "rails", "~> 7.0.8"
+gem "rails", "~> 7.1"
 gem "rails-i18n"
 gem "rack", "~> 2.2"
 gem "sprockets", "< 4"
@@ -37,6 +37,7 @@ gem 'unicode_utils', '>=1.4.0'
 gem "lograge" # https://github.com/roidrage/lograge
 
 gem 'will_paginate', '>=3.0.2'
+gem "pagy", "~> 9.3"
 gem 'acts_as_list', '~> 0.9.7'
 gem 'akismetor'
 
@@ -83,9 +84,7 @@ gem 'timeliness'
 gem 'google_visualr', git: 'https://github.com/winston/google_visualr'
 
 # Globalize for translations
-# Must use master branch and activemodel-serializers-xml for Rails 5 upgrade
-gem 'globalize', git: 'https://github.com/globalize/globalize'
-gem 'activemodel-serializers-xml'
+gem "globalize", "~> 7.0"
 
 # Add a clean notifier that shows we are on dev or test
 gem 'rack-dev-mark', '>=0.7.8'
@@ -108,10 +107,10 @@ gem 'kgio', '2.10.0'
 gem "marcel", "1.0.2"
 
 # Library for helping run pt-online-schema-change commands:
-gem "departure", "~> 6.5"
+gem "departure", "~> 6.7"
 
-# Ruby 3.1 means we need to specify a version of mail until we get to rails 7.x
-gem "mail", ">= 2.8"
+gem "rack-timeout"
+gem "puma_worker_killer"
 
 group :test do
   gem "rspec-rails", "~> 6.0"