resolved conflict with main

.github/workflows/pr.yaml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Trigger deployment on comment
         id: trigger-deployment
-        uses: shanegenschaw/pull-request-comment-trigger@v2.1.0
+        uses: shanegenschaw/pull-request-comment-trigger@v3.0.0
         with:
           trigger: '@thewca-bot deploy staging'
           reaction: rocket
@@ -29,6 +29,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR_NUMBER: ${{ github.event.issue.number }}
+      - name: Get the SHA of the current branch/fork
+        shell: bash
+        run: |
+          echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> "$GITHUB_ENV"
         if: steps.trigger-deployment.outputs.triggered == 'true'
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -56,7 +60,7 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |
-            BUILD_TAG=${{ github.sha }}
+            BUILD_TAG=${{ env.SHORT_SHA }}
       - name: Build and push worker Image
         if: steps.trigger-deployment.outputs.triggered == 'true'
         uses: docker/build-push-action@v6
@@ -69,7 +73,7 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |
-            BUILD_TAG=${{ github.sha }}
+            BUILD_TAG=${{ env.SHORT_SHA }}
       - name: Deploy if triggered
         if: steps.trigger-deployment.outputs.triggered == 'true'
         env:

.rubocop.yml

@@ -7,7 +7,10 @@ AllCops:
     - 'vendor/**/*'
     - 'infra/**/*'
 
-require: rubocop-rails
+require:
+  - rubocop-rails
+  - rubocop-performance
+
 
 Bundler/OrderedGems:
   Enabled: false

.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.5

Gemfile

@@ -3,11 +3,11 @@
 source 'https://rubygems.org'
 git_source(:github) { |_repo| 'https://github.com/thewca/wca-registration.git' }
 
-ruby '3.3.0'
+ruby '3.3.5'
 
 # Gems that are only needed by the handler not the worker
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem 'rails', '~> 7.1.3'
+gem 'rails', '~> 7.2.1'
 
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
@@ -54,9 +54,6 @@ gem 'kredis'
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 
-# Exposes Metrics
-gem 'prometheus_exporter'
-
 # vault for secrets management
 gem 'vault'
 
@@ -85,6 +82,7 @@ group :development, :test do
 
   gem 'rubocop', require: false
   gem 'rubocop-rails', require: false
+  gem 'rubocop-performance', require: false
 
   # Use factories instead of fixtures
   gem 'factory_bot_rails'