chore: resolve merge conflicts with master

Author: mroderick

.github/workflows/ruby.yml

@@ -45,15 +45,15 @@ jobs:
       id: playwright-cache
       with:
         path: ~/.cache/ms-playwright
-        key: playwright-${{ runner.os }}-1.58.0
+        key: playwright-${{ runner.os }}-1.59.0
 
     - name: Install Playwright browsers (cache miss)
       if: steps.playwright-cache.outputs.cache-hit != 'true'
-      run: npx --yes playwright@1.58.0 install --with-deps chromium
+      run: npx --yes playwright@1.59.0 install --with-deps chromium
 
     - name: Install Playwright system deps (cache hit)
       if: steps.playwright-cache.outputs.cache-hit == 'true'
-      run: npx --yes playwright@1.58.0 install-deps chromium
+      run: npx --yes playwright@1.59.0 install-deps chromium
 
     - name: Setup test databases
       env:
@@ -78,7 +78,7 @@ jobs:
         cp coverage/.resultset.json coverage/resultset-${{ matrix.ci_node_index }}.json
 
     - name: Upload coverage artifacts
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: coverage-${{ matrix.ci_node_index }}
         path: coverage/resultset-${{ matrix.ci_node_index }}.json
@@ -98,7 +98,7 @@ jobs:
         bundler-cache: true
 
     - name: Download all coverage artifacts
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v8
       with:
         path: coverage-results
 

.gitignore

@@ -59,5 +59,5 @@ vendor/bundle
 yarn-debug.log*
 .yarn-integrity
 
-# Git worktrees
-.worktrees
+# Worktrees
+.worktrees/

Gemfile

@@ -45,7 +45,7 @@ gem 'simple_form'
 
 gem 'terser'
 
-gem 'pagy', '~> 43.2'
+gem 'pagy', '~> 43.5'
 
 gem 'icalendar'
 gem 'tzinfo-data'
@@ -58,7 +58,7 @@ gem 'faraday'
 
 gem 'stripe'
 
-gem 'rails-html-sanitizer', '~> 1.6.2'
+gem 'rails-html-sanitizer', '~> 1.7.0'
 
 # Use the Puma web server [https://github.com/puma/puma]
 gem 'puma', '~> 7.2'
@@ -69,6 +69,7 @@ gem 'turbo-rails'
 # Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
 gem 'stimulus-rails'
 gem 'public_activity'
+gem 'view_component'
 
 group :development do
   gem 'better_errors'