Merge upstream

.github/workflows/automated-tests.yml

@@ -34,7 +34,7 @@ jobs:
           - 3306:3306
 
       elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.5
+        image: docker.elastic.co/elasticsearch/elasticsearch:7.17.26
         ports:
           - 9200:9200
         options: >-
@@ -58,12 +58,15 @@ jobs:
             arguments: spec/models
           - command: rspec
             arguments: --exclude-pattern 'spec/{controllers,models}/**/*.rb'
+            libvips: true
           - command: cucumber
             arguments: features/admins
+            libvips: true
           - command: cucumber
             arguments: features/bookmarks
           - command: cucumber
             arguments: features/collections
+            libvips: true
           - command: cucumber
             arguments: features/comments_and_kudos
           - command: cucumber
@@ -73,8 +76,10 @@ jobs:
             vcr: true
           - command: cucumber
             arguments: features/other_a
+            libvips: true
           - command: cucumber
             arguments: features/other_b
+            libvips: true
           - command: cucumber
             arguments: features/prompt_memes_a
           - command: cucumber
@@ -129,6 +134,10 @@ jobs:
           restore-keys: |
             cassette-library-${{ hashFiles(matrix.tests.arguments) }}-
 
+      - name: Install libvips for image processing
+        if: ${{ matrix.tests.libvips }}
+        run: sudo apt-get install -y libvips-dev
+
       - name: Set up Ruby and run bundle install
         uses: ruby/setup-ruby@v1
         with:
@@ -150,7 +159,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,12 +23,12 @@ jobs:
           bundler-cache: true
 
       - name: rubocop
-        uses: reviewdog/action-rubocop@a162a8e8976d8b3b7141c2147d7d79eed7cc8c4c
+        uses: reviewdog/action-rubocop@cd8c2943f425b54f97095777109ae9f1f2d79a61
         with:
           use_bundler: true
           reporter: github-pr-check
           skip_install: true
-          fail_on_error: true
+          fail_level: any
 
   erb-lint:
     name: ERB Lint runner

.gitignore

@@ -58,6 +58,9 @@ public/system/test
 # /tmp/
 /tmp/*
 
+# ActiveRecord storage path
+storage/
+
 # /vendor/
 /vendor/gems
 

.rubocop.yml

@@ -122,6 +122,11 @@ Migration/LargeTableSchemaUpdate:
     - users
     - works
 
+Naming/VariableNumber:
+  AllowedIdentifiers:
+    - age_over_13
+    - no_age_over_13
+
 Rails/DefaultScope:
   Enabled: true
 
@@ -149,6 +154,8 @@ Rails/OutputSafety:
 
 Rails/Output:
   Exclude:
+    # Allow patches to print warnings to console:
+    - 'config/initializers/monkeypatches/*.rb'
     # Allow migrations to print pt-osc comments to console:
     - 'db/migrate/*.rb'
 

CONTRIBUTING.md

@@ -2,13 +2,13 @@
 
 ## Reporting bugs
 
-We maintain a [Jira issue tracker](https://otwarchive.atlassian.net) for developers,
+We maintain a [Jira issue tracker](https://otwarchive.atlassian.net/projects/AO3/issues) for developers,
 and a [list of Known Issues](https://archiveofourown.org/known_issues) for
 [Archive of Our Own](https://archiveofourown.org) users, neither of which are
 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,39 +25,31 @@ 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
 
 **We only accept pull requests for issues we have already added to [Jira](https://otwarchive.atlassian.net)**,
 with the exception of spelling corrections and documentation improvements
-(e.g. any Markdown files). 
-
-If you'd like the ability to comment on, assign, and transition issues, 
-you're welcome to create a Jira account! (It makes things a bit easier for us
-on the organizational side if 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).") We'll give you permissions when
-you create your first pull request.
+(e.g. any Markdown files). We also do not accept code generated by AI tools; for more information,
+please refer to [our commit policy](https://github.com/otwcode/otwarchive/wiki/Commit-Policy#scary-legal-stuff).
 
 Please check out our development wiki for more information on:
 
 - [how to set up a development environment](https://github.com/otwcode/otwarchive/wiki)
 - [code conventions](https://github.com/otwcode/otwarchive/wiki/Commit-policy)
 
-Please follow the checklist on [our template](https://github.com/otwcode/otwarchive/blob/master/.github/PULL_REQUEST_TEMPLATE.md) when submitting pull requests.
-
-Please be patient with us! Due to our workload, it may take some time before we
-can review and eventually merge your pull request.
-
-Once your pull request is merged, it will be deployed to our internal testing site
-and our QA team will check that everything is working as intended. If not, we may
-set the issue to ["Broken on Test"](https://github.com/otwcode/otwarchive/wiki/Issue-Tracking-with-Jira)
-and ask you to make further changes in new pull requests.
+### Workflow
 
-If all is well, your contribution will be deployed to the [Archive of Our Own](https://archiveofourown.org)
-and you will be credited in the [release notes](https://archiveofourown.org/admin_posts?tag=1)!
+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.)
+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).
+5. Once you've submitted a pull request, we'll review your code and give you permissions on Jira. Please be patient with us! Due to our workload, it may take some time before we can review and eventually merge your pull request.
+6. Once your pull request is merged, we will deploy it to our internal testing site and our QA team will check that everything is working as intended.
+7. If something is not working as intended, we may set the issue to ["Broken on Test"](https://github.com/otwcode/otwarchive/wiki/Issue-Tracking-with-Jira) and ask you to make further changes in new pull requests.
+8. If all is well, your contribution will be deployed to the [Archive of Our Own](https://archiveofourown.org) and you will be credited in the [release notes](https://archiveofourown.org/admin_posts?tag=1)!
 
 
 ## Volunteering for the OTW

Gemfile

@@ -56,7 +56,6 @@ gem "aws-sdk-s3"
 gem 'css_parser'
 
 gem "terrapin"
-gem "kt-paperclip", ">= 5.2.0"
 
 # for looking up image dimensions quickly
 gem 'fastimage'
@@ -115,7 +114,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"
@@ -172,6 +171,8 @@ gem 'rvm-capistrano'
 
 # Use unicorn as the web server
 gem 'unicorn', '~> 5.5', require: false
+# Install puma so we can migrate to it
+gem "puma", "~> 6.5.0"
 # Use god as the monitor
 gem 'god', '~> 0.13.7'
 
@@ -181,3 +182,5 @@ group :staging, :production do
   gem "sentry-rails"
   gem "sentry-resque"
 end
+
+gem "image_processing", "~> 1.12"