Merge branch 'main' into refactor/css-cleanup

.env.example

@@ -75,7 +75,7 @@ PAGERDUTY_ACCOUNT_EMAIL="admin@mycompany.com"
 PAGERDUTY_API_KEY="u+XXXXXXXXXXXXXXXX-X"
 PAGERDUTY_URL="https://api.pagerduty.com"
 
-## SSO settings (optional)
+## SSO settings
 
 OIDC_OP_DISCOVERY_DOCUMENT_URL=https://oauth.mycompany.local/auth/realms/realm/.well-known/openid-configuration
 OIDC_RP_CLIENT_ID=firefighter-incident
@@ -98,5 +98,6 @@ RAID_JIRA_PROJECT_KEY="T2"
 RAID_TOOLBOX_URL=https://toolbox.mycompany.com/login
 
 FF_SLACK_SKIP_CHECKS=true
-# Disable SSO redirect for local dev by setting to true. When SSO is disabled, go to /admin/ to login
+# Disable SSO redirect for local dev by setting to true but still need a valid URL in OIDC_OP_DISCOVERY_DOCUMENT_URL.
+# When SSO is disabled, go to /admin/ to login
 FF_DEBUG_NO_SSO_REDIRECT=false

.github/workflows/ci.yml

@@ -63,7 +63,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup PDM
-        uses: pdm-project/setup-pdm@v3
+        uses: pdm-project/setup-pdm@v4
         id: setup-pdm
         with:
           python-version: ${{ matrix.python-version }}

.github/workflows/release.yml

@@ -199,7 +199,7 @@ jobs:
           images: ghcr.io/ManoManoTech/firefighter-incident
 
       - name: "Build and push Docker image"
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
       - id: fix-byte-order-marker
   # Versions must be kept in sync with lockfile
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.4.10'
+    rev: 'v0.6.8'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
@@ -35,3 +35,9 @@ repos:
       - id: djhtml
       - id: djcss
       - id: djjs
+
+  - repo: https://github.com/adamchainz/djade-pre-commit
+    rev: "1.1.1"
+    hooks:
+      - id: djade
+        args: [--target-version, "4.2"]

docker-compose.yaml

@@ -2,8 +2,6 @@
 # This configuration file is for the **development** setup.
 # It will launch Postgres and Redis containers, not the app itself.
 
-version: "3.1"
-
 services:
   db:
     container_name: ff-db

docs/contributing/0002-setup-slack-app.md

@@ -149,7 +149,7 @@ Check the `.env`.
 
 Read the settings page.
 
-Once Slack is setup, you can remove FF_SKIP_SLACK_CHEKS=true from your `.env` file.
+Once Slack is setup, you can remove FF_SLACK_SKIP_CHECKS=true from your `.env` file.
 
 Using the information from the previous part, check your configuration.