From 039eb0f0d5ceb26e931cc50810a6d4e751f107da Mon Sep 17 00:00:00 2001
From: Jen Jones Arnesen <jennifer@dhis2.org>
Date: Fri, 21 Jun 2024 11:53:41 +0200
Subject: [PATCH 1/3] chore: dev branch is no longer part of the workflow

---
 .github/workflows/dhis2-verify-app.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml
index 0b6076c18a..95cc70b511 100644
--- a/.github/workflows/dhis2-verify-app.yml
+++ b/.github/workflows/dhis2-verify-app.yml
@@ -6,7 +6,6 @@ on:
     push:
         branches:
             - 'master'
-            - 'dev'
         tags:
             - '*'
 

From a814fb59576a0e2e74a76aaaf141bfade2e199d9 Mon Sep 17 00:00:00 2001
From: Jen Jones Arnesen <jennifer@dhis2.org>
Date: Fri, 21 Jun 2024 11:54:02 +0200
Subject: [PATCH 2/3] chore: group together dependabot PRs

---
 .github/dependabot.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 51a5c167de..3c982e258e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,8 +1,22 @@
 version: 2
 updates:
     - package-ecosystem: npm
-      directory: '/'
+      directory: /
       schedule:
           interval: weekly
-      open-pull-requests-limit: 10
+      open-pull-requests-limit: 5
       versioning-strategy: increase
+      groups:
+          security:
+              applies-to: security-updates
+              update-types:
+                  - minor
+                  - patch
+          dependencies:
+              applies-to: version-updates
+              update-types:
+                  - minor
+                  - patch
+              exclude-patterns:
+                  - '*@dhis2*'
+                  - '*i18next*'

From 1fd40b77057c530ca3b6b6ed23273fb6b91230e4 Mon Sep 17 00:00:00 2001
From: Jen Jones Arnesen <jennifer@dhis2.org>
Date: Fri, 21 Jun 2024 12:00:24 +0200
Subject: [PATCH 3/3] chore: align hook with line-listing

---
 .hooks/pre-commit | 4 +++-
 package.json      | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.hooks/pre-commit b/.hooks/pre-commit
index 4a59cc2ab5..66e20dd191 100755
--- a/.hooks/pre-commit
+++ b/.hooks/pre-commit
@@ -1,4 +1,6 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn validate-commit
+yarn d2-app-scripts i18n extract && \
+    git add i18n && \
+    yarn d2-style check --staged
diff --git a/package.json b/package.json
index 2230100759..66737ff165 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
         "deploy": "d2-app-scripts deploy",
         "lint": "d2-style check",
         "format": "d2-style apply",
-        "validate-commit": "d2-style check --staged",
         "validate-push": "yarn test",
         "cy:open": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress open --e2e --env networkMode=live'",
         "cy:run": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress run --browser chrome headless --env networkMode=live'"