Resolve conflicts with upstream

.github/workflows/automated-tests.yml

@@ -54,16 +54,22 @@ jobs:
             arguments: db:otwseed
           - command: rspec
             arguments: spec/controllers
+            imagemagick: true
           - command: rspec
             arguments: spec/models
+            imagemagick: true
           - command: rspec
             arguments: --exclude-pattern 'spec/{controllers,models}/**/*.rb'
+            imagemagick: true
           - command: cucumber
             arguments: features/admins
+            imagemagick: true
           - command: cucumber
             arguments: features/bookmarks
+            imagemagick: true
           - command: cucumber
             arguments: features/collections
+            imagemagick: true
           - command: cucumber
             arguments: features/comments_and_kudos
           - command: cucumber
@@ -73,8 +79,10 @@ jobs:
             vcr: true
           - command: cucumber
             arguments: features/other_a
+            imagemagick: true
           - command: cucumber
             arguments: features/other_b
+            imagemagick: true
           - command: cucumber
             arguments: features/prompt_memes_a
           - command: cucumber
@@ -92,6 +100,7 @@ jobs:
           - command: cucumber
             arguments: features/works
             ebook: true
+            imagemagick: true
 
     steps:
       - name: Check out code
@@ -129,6 +138,10 @@ jobs:
           restore-keys: |
             cassette-library-${{ hashFiles(matrix.tests.arguments) }}-
 
+      - name: Install imagemagick for image processing
+        if: ${{ matrix.tests.imagemagick }}
+        run: sudo apt-get install -y imagemagick
+
       - name: Set up Ruby and run bundle install
         uses: ruby/setup-ruby@v1
         with:
@@ -150,7 +163,7 @@ jobs:
         run: bundle exec ${{ matrix.tests.command }} ${{ matrix.tests.arguments }}
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           # Optional for public repos. However, individual forks can set this
           # secret to reduce the chance of being rate-limited by GitHub.

.github/workflows/reviewdog.yml

@@ -23,7 +23,7 @@ jobs:
           bundler-cache: true
 
       - name: rubocop
-        uses: reviewdog/action-rubocop@a162a8e8976d8b3b7141c2147d7d79eed7cc8c4c
+        uses: reviewdog/action-rubocop@5e23bb67d79c93e5eb45bdae6d08b04052afec35
         with:
           use_bundler: true
           reporter: github-pr-check

.rubocop.yml

@@ -122,6 +122,11 @@ Migration/LargeTableSchemaUpdate:
     - users
     - works
 
+Naming/VariableNumber:
+  AllowedIdentifiers:
+    - age_over_13
+    - no_age_over_13
+
 Rails/DefaultScope:
   Enabled: true
 

CONTRIBUTING.md

@@ -8,7 +8,7 @@ and a [list of Known Issues](https://archiveofourown.org/known_issues) for
 publicly editable.
 
 If you need help using the site, or want to report an issue you have found,
-please [contact the AO3 Support team](https://archiveofourown.org/support).
+please [contact the AO3 Support team](https://archiveofourown.org/support). Our Support team is staffed by volunteers, so please wait for a response before submitting another ticket. Duplicate submissions will not make things happen faster.
 
 
 ## Reporting security issues
@@ -25,7 +25,7 @@ official OTW volunteers, please feel free to make changes!
 
 ## Suggesting new features
 
-Please [contact the AO3 Support team](https://archiveofourown.org/support).
+Please [contact the AO3 Support team](https://archiveofourown.org/support). Our Support team is staffed by volunteers, so please wait for a response before submitting another ticket. Duplicate submissions will not make things happen faster.
 
 
 ## Contributing code

Gemfile

@@ -115,7 +115,7 @@ gem "departure", "~> 6.5"
 gem "mail", ">= 2.8"
 
 group :test do
-  gem "rspec-rails", "~> 4.0.1"
+  gem "rspec-rails", "~> 6.0"
   gem 'pickle'
   gem 'shoulda'
   gem "capybara"