Merge branch 'main' into ui3

Author: lachlanjc

.devcontainer/devcontainer.json

@@ -19,7 +19,7 @@
 	"build": {
 		"args": {
 			// Update 'VARIANT' to pick a Ruby version: 2, 2.7, 2.6, 2.5, 2.4, 2.3, 2.2, 2.1, 2.0, 1.9
-			"VARIANT": "3.2-bookworm",
+			"VARIANT": "3.3-bookworm",
 			"NODE_VERSION": "22"  // Node version installed by nvm (https://github.com/devcontainers/images/tree/main/src/ruby#installing-nodejs)
 		}
 	},

.dockerignore

@@ -0,0 +1,47 @@
+# See https://docs.docker.com/engine/reference/builder/#dockerignore-file for more about ignoring files.
+
+# Ignore git directory.
+/.git/
+/.gitignore
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all environment files.
+/.env*
+
+# Ignore all default key files.
+/config/master.key
+/config/credentials/*.key
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/.keep
+
+# Ignore storage (uploaded files in development and any SQLite databases).
+/storage/*
+!/storage/.keep
+/tmp/storage/*
+!/tmp/storage/.keep
+
+# Ignore assets.
+/node_modules/
+/app/assets/builds/*
+!/app/assets/builds/.keep
+/public/assets
+
+# Ignore CI service files.
+/.github
+
+# Ignore development files
+/.devcontainer
+
+# Ignore Docker-related files
+/.dockerignore
+/Dockerfile*

.erb-lint.yml renamed to .erb_lint.yml

@@ -12,12 +12,19 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: Install Poppler
+        run: |
+          sudo apt-get update
+          sudo apt -y install libpoppler-glib-dev
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - name: Run Rubocop
-        run: bundle exec rubocop
+        run: bundle exec rubocop -a
+      - name: Comment suggested changes
+        uses: parkerbxyz/[email protected]
+        if: ${{ github.event.pull_request }}
   erblint:
     name: 'ERB Lint'
     runs-on: ubuntu-latest
@@ -93,9 +100,9 @@ jobs:
           node-version-file: package.json
       - name: Find yarn cache location
         id: yarn-cache
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
       - name: JS package cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -145,9 +152,9 @@ jobs:
           node-version-file: package.json
       - name: Find yarn cache location
         id: yarn-cache
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
       - name: JS package cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

.github/workflows/ci.yml

@@ -12,8 +12,8 @@ gem "puma", "~> 6.5" # app server
 
 gem "pg", ">= 0.18", "< 2.0" # database
 gem "redis", "~> 5.3" # for caching, jobs, etc.
-gem "sidekiq", "~> 7.3.2" # background jobs
-gem "sidekiq-cron", "~> 1.12" # run Sidekiq jobs at scheduled intervals
+gem "sidekiq", "~> 7.3.8" # background jobs
+gem "sidekiq-cron", "~> 2.1" # run Sidekiq jobs at scheduled intervals
 
 gem "image_processing", "~> 1.2"
 gem "mini_magick"
@@ -35,7 +35,8 @@ gem "faraday" # web requests
 gem "increase", "~> 0.3.3"
 gem "stripe", "11.7.0"
 gem "plaid", "~> 34.0"
-gem "yellow_pages", github: "hackclub/yellow_pages", ref: "4711379"
+gem "yellow_pages", github: "hackclub/yellow_pages"
+gem "recursive-open-struct" # for stubbing stripe api objects
 
 gem "aws-sdk-s3", require: false
 
@@ -53,7 +54,7 @@ gem "blind_index" # needed to query and/or guarantee uniqueness for encrypted fi
 gem "aasm" # state machine
 
 gem "paper_trail", "~> 16.0.0" # track changes to models
-gem "acts_as_paranoid", "~> 0.10.2" # enables soft deletions
+gem "acts_as_paranoid", "~> 0.10.3" # enables soft deletions
 
 gem "friendly_id", "~> 5.5.1" # slugs
 gem "hashid-rails", "~> 1.0" # obfuscate IDs in URLs
@@ -109,7 +110,7 @@ gem "xxhash" # fast hashing
 
 gem "diffy" # rendering diffs (comments)
 
-gem "webauthn", "~> 3.1"
+gem "webauthn", "~> 3.2"
 
 gem "ahoy_matey" # analytics
 gem "airbrake" # exception tracking
@@ -156,7 +157,7 @@ end
 group :development, :test do
   gem "erb_lint", require: false
   gem "rubocop"
-  gem "rubocop-rails", "~> 2.27"
+  gem "rubocop-rails", "~> 2.29"
   gem "relaxed-rubocop"
 
   gem "rspec-rails", "~> 7.1.0"
@@ -224,3 +225,7 @@ gem "eu_central_bank"
 gem "whitesimilarity"
 
 gem "rack-timeout", require: "rack/timeout/base"
+
+# IRB is pinned to 1.14.3 because Console1984 is incompatible with >=1.15.0.
+# https://github.com/basecamp/console1984/issues/127
+gem "irb", "~> 1.14.3"