Merge remote-tracking branch 'upstream/master' into AO3-6392

.erb-lint.yml

@@ -1,6 +1,10 @@
 ---
 EnableDefaultLinters: true
 linters:
+  AllowedScriptType:
+    allowed_types:
+      - "text/javascript"
+      - "speculationrules"
   DeprecatedClasses:
     enabled: true
     rule_set:

.github/labeler/awaiting.yml

@@ -1,4 +1,3 @@
 "Awaiting Review":
-  - "**/*"
-  - ".*"
-  - ".*/**/*"
+- changed-files:
+  - any-glob-to-any-file: "**/*"

.github/labeler/contents.yml

@@ -1,14 +1,15 @@
 "Gem Updates":
-  - "Gemfile"
-  - "Gemfile.lock"
+- changed-files:
+  - any-glob-to-any-file: ["Gemfile", "Gemfile.lock"]
 
 "Has Migrations":
-  - "db/migrate/**/*"
+- changed-files:
+  - any-glob-to-any-file: "db/migrate/**/*"
 
 "Scope: i18n Only":
-  - all:
-    - "config/locales/**/*"
+- changed-files:
+  - any-glob-to-all-files: "config/locales/**/*"
 
 "Scope: Tests Only":
-  - all:
-    - "{factories,features,spec,test,.github}/**/*"
+- changed-files:
+  - any-glob-to-all-files: "{factories,features,spec,test,.github}/**/*"

.github/labeler/review.yml

@@ -1,8 +1,9 @@
 # Label to be added when the PR is updated:
 "Coder Has Actioned Review":
-  - "**/*"
-  - ".*"
-  - ".*/**/*"
+- changed-files:
+  - any-glob-to-any-file: "**/*"
 
-# Label to be removed when the PR is updated:
-"Reviewed: Action Needed": []
+# Condition is always false so the label is removed when the PR is updated:
+"Reviewed: Action Needed":
+- changed-files:
+  - any-glob-to-any-file: "!**/*"

.github/workflows/automated-tests.yml

@@ -104,24 +104,17 @@ jobs:
           sudo apt-get install -y redis-server
           ./script/gh-actions/multiple_redis.sh
 
-      - name: Cache wkhtmltopdf package
-        if: ${{ matrix.tests.ebook }}
-        uses: actions/cache@v3
-        with:
-          path: wkhtmltopdf
-          key: wkhtmltopdf-${{ hashFiles('script/gh-actions/ebook_converters.sh') }}
-
       - name: Install ebook converters
         if: ${{ matrix.tests.ebook }}
         run: ./script/gh-actions/ebook_converters.sh
 
       - name: Cache VCR cassettes
         if: ${{ matrix.tests.vcr }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: features/cassette_library
 
-          # Unfortunately, the actions/cache@v3 version doesn't allow the cache
+          # Unfortunately, the actions/cache@v4 version doesn't allow the cache
           # key to be overwritten if there's an exact match. So instead we add
           # a unique identifier to the key to always force a "cache miss", and
           # restore from related keys to make sure that we still get to load a
@@ -156,7 +149,7 @@ jobs:
         run: bundle exec ${{ matrix.tests.command }} ${{ matrix.tests.arguments }}
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           # Optional for public repos. However, individual forks can set this
           # secret to reduce the chance of being rate-limited by GitHub.
@@ -167,7 +160,7 @@ jobs:
 
       - name: Upload failure screenshots
         if: ${{ failure() && matrix.tests.command == 'cucumber' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test failures ${{ hashFiles('tmp/capybara/*') }}
           path: tmp/capybara

.github/workflows/brakeman-scan.yml

@@ -39,6 +39,6 @@ jobs:
 
     # Upload the SARIF file generated in the previous step
     - name: Upload SARIF
-      uses: github/codeql-action/upload-sarif@v2
+      uses: github/codeql-action/upload-sarif@v3
       with:
         sarif_file: output.sarif.json

.github/workflows/labeler.yml

@@ -8,20 +8,20 @@ jobs:
     steps:
 
       - name: Content-Based
-        uses: actions/labeler@v4
+        uses: actions/labeler@v5
         with:
           configuration-path: ".github/labeler/contents.yml"
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Awaiting Review
-        uses: actions/labeler@v4
+        uses: actions/labeler@v5
         if: github.event.action == 'opened'
         with:
           configuration-path: ".github/labeler/awaiting.yml"
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Coder Has Actioned Review
-        uses: actions/labeler@v4
+        uses: actions/labeler@v5
         # https://github.uint.cloudmunity/t/do-something-if-a-particular-label-is-set/17149/4
         if: "contains(github.event.pull_request.labels.*.name, 'Reviewed: Action Needed')"
         with:

.github/workflows/reviewdog.yml

@@ -8,9 +8,32 @@ permissions:
   checks: write
 
 jobs:
+  rubocop:
+    name: Rubocop
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_ONLY: linters
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby and run bundle install
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: rubocop
+        uses: reviewdog/action-rubocop@2c8048e3169487eccc1eed812daaa6e5275a809f
+        with:
+          use_bundler: true
+          reporter: github-pr-check
+          skip_install: true
+
   erb-lint:
     name: ERB Lint runner
     runs-on: ubuntu-latest
+    env:
+      BUNDLE_ONLY: linters
     steps:
       - name: Check out code
         uses: actions/checkout@v4

.gitignore

@@ -4,6 +4,7 @@
 .idea
 stdout
 *~
+.vscode/
 # /
 /*.tmproj
 /sphinx

.hound.yml

@@ -6,5 +6,4 @@ jshint:
   ignore_file: .jshintignore
 
 rubocop:
-  version: 1.22.1
-  config_file: .rubocop.yml
+  enabled: false

.rubocop.yml

@@ -6,6 +6,7 @@
 require:
   - rubocop-rails
   - rubocop-rspec
+  - ./rubocop/rubocop
 
 inherit_mode:
   merge:
@@ -18,6 +19,10 @@ AllCops:
 Bundler/OrderedGems:
   Enabled: false
 
+I18n/DeprecatedTranslationKey:
+    Rules:
+      name_with_colon: "Prefer `name` with `mailer.general.metadata_label_indicator` over `name_with_colon`"
+
 Layout/DotPosition:
   EnforcedStyle: leading
 
@@ -72,6 +77,51 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Enabled: false
 
+Migration/LargeTableSchemaUpdate:
+  Tables:
+    - abuse_reports
+    - admin_activities
+    - audits
+    - bookmarks
+    - comments
+    - common_taggings
+    - collection_items
+    - collection_participants
+    - collection_profiles
+    - collections
+    - creatorships
+    - external_works
+    - favorite_tags
+    - feedbacks
+    - filter_counts
+    - filter_taggings
+    - gifts
+    - inbox_comments
+    - invitations
+    - kudos
+    - log_items
+    - mutes
+    - preferences
+    - profiles
+    - prompts
+    - pseuds
+    - readings
+    - set_taggings
+    - serial_works
+    - series
+    - skins
+    - stat_counters
+    - subscriptions
+    - tag_nominations
+    - tag_set_associations
+    - tags
+    - taggings
+    - users
+    - works
+
+Rails/DefaultScope:
+  Enabled: true
+
 Rails/DynamicFindBy:
   AllowedMethods:
     # Exception for Tag.find_by_name

.ruby-version

@@ -1 +1 @@
-ruby-3.0.5
+ruby-3.1.4

Gemfile

@@ -1,12 +1,13 @@
 source 'https://rubygems.org'
 
-ruby "3.0.5"
+ruby "3.1.4"
 
 gem 'test-unit', '~> 3.2'
 
 gem 'bundler'
 
 gem "rails", "~> 6.1.7"
+
 gem "rails-i18n"
 gem "rack", "~> 2.2"
 gem "sprockets", "< 4"
@@ -66,6 +67,10 @@ gem 'devise'
 gem 'devise-async'       # To mails through queues
 gem 'bcrypt'
 
+# Needed for modern ssh
+gem "ed25519", ">= 1.2", "< 2.0"
+gem "bcrypt_pbkdf", ">= 1.0", "< 2.0"
+
 # A highly updated version of the authorization plugin
 gem 'permit_yo'
 gem "pundit"
@@ -116,6 +121,9 @@ gem "mimemagic", "0.3.10"
 # Library for helping run pt-online-schema-change commands:
 gem "departure", "~> 6.5"
 
+# Ruby 3.1 means we need to specify a version of mail until we get to rails 7.x
+gem "mail", ">= 2.8"
+
 group :test do
   gem "rspec-rails", "~> 4.0.1"
   gem 'pickle'
@@ -127,7 +135,7 @@ group :test do
   gem 'capybara-screenshot'
   gem 'cucumber-rails', require: false
   gem 'launchy'    # So you can do Then show me the page
-  gem 'delorean'
+
   # Record and replay data from external URLs
   gem 'vcr', '~> 3.0', '>= 3.0.1'
   gem "webmock"
@@ -147,6 +155,7 @@ group :test, :development do
   gem 'whiny_validation'
   gem "factory_bot_rails"
   gem 'minitest'
+  gem "listen", "~> 3.3"
   gem "i18n-tasks", require: false
 end