From 73ed5ef7509a58fcc4915e35bfdd1a133c11047f Mon Sep 17 00:00:00 2001
From: dgibbs64 <me@danielgibbs.co.uk>
Date: Wed, 22 Jul 2026 21:14:11 +0000
Subject: [PATCH 1/2] chore(sync): synced local '.github/' with remote
 'general/.github/'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Synced from dgibbs64/repo-sync@007a1a3634394844874d6dc6ebf5f43136f12001 — fix(sync): target LinuxGSM develop branch instead of master

master has minimal branch protection (admin bypass), so syncs there landed without review. develop enforces PR review and required checks.
---
 .../workflows/action-dependabot-automerge.yml | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/action-dependabot-automerge.yml

diff --git a/.github/workflows/action-dependabot-automerge.yml b/.github/workflows/action-dependabot-automerge.yml
new file mode 100644
index 0000000..9107d55
--- /dev/null
+++ b/.github/workflows/action-dependabot-automerge.yml
@@ -0,0 +1,27 @@
+name: Dependabot auto-merge
+
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Fetch dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Approve and enable auto-merge for minor/patch updates
+        if: steps.metadata.outputs.update-type != 'version-update:semver-major'
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr review --approve "$PR_URL"
+          gh pr merge --auto --squash "$PR_URL"

From b94f434d886c66001ed48dc671c414e2d58eba3d Mon Sep 17 00:00:00 2001
From: dgibbs64 <me@danielgibbs.co.uk>
Date: Wed, 22 Jul 2026 21:14:11 +0000
Subject: [PATCH 2/2] chore(sync): synced local './' with remote 'docker/'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Synced from dgibbs64/repo-sync@007a1a3634394844874d6dc6ebf5f43136f12001 — fix(sync): target LinuxGSM develop branch instead of master

master has minimal branch protection (admin bypass), so syncs there landed without review. develop enforces PR review and required checks.
---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2540d59..49f4d88 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -29,5 +29,5 @@
       ]
     }
   },
-  "postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template"
+  "postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template && sudo apt-get update && sudo apt-get install -y ripgrep"
 }