From 59a0b4defee76b43fba0c60a2f320a68cb4cb506 Mon Sep 17 00:00:00 2001
From: Adam Warner <me@adamwarner.co.uk>
Date: Mon, 2 Sep 2024 20:30:44 +0100
Subject: [PATCH] Replace references of `devel` with `development` in prep for
 change of branch name

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
---
 .github/dependabot.yml                 | 39 ++------------------------
 .github/workflows/codeql.yml           |  4 +--
 .github/workflows/sync-back-to-dev.yml |  2 +-
 .github/workflows/test.yml             |  2 +-
 CONTRIBUTING.md                        |  4 +--
 5 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ce7fd50f..7202fb3e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,7 +7,7 @@ updates:
     day: saturday
     time: "10:00"
   open-pull-requests-limit: 10
-  target-branch: devel
+  target-branch: development
   versioning-strategy: increase
   reviewers:
     - "pi-hole/web-maintainers"
@@ -18,7 +18,7 @@ updates:
     day: saturday
     time: "10:00"
   open-pull-requests-limit: 10
-  target-branch: devel
+  target-branch: development
   reviewers:
     - "pi-hole/web-maintainers"
 - package-ecosystem: composer
@@ -28,39 +28,6 @@ updates:
     day: saturday
     time: "10:00"
   open-pull-requests-limit: 10
-  target-branch: development-v6
-  reviewers:
-    - "pi-hole/web-maintainers"
-
-# As above, but for development-v6
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "10:00"
-  open-pull-requests-limit: 10
-  target-branch: development-v6
-  versioning-strategy: increase
-  reviewers:
-    - "pi-hole/web-maintainers"
-- package-ecosystem: github-actions
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "10:00"
-  open-pull-requests-limit: 10
-  target-branch: development-v6
-  reviewers:
-    - "pi-hole/web-maintainers"
-- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "10:00"
-  open-pull-requests-limit: 10
-  target-branch: development-v6
+  target-branch: development
   reviewers:
     - "pi-hole/web-maintainers"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 601c57a1..eaaf4d94 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -4,13 +4,13 @@ on:
   push:
     branches:
       - master
-      - devel
+      - development
       - "!dependabot/**"
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
       - master
-      - devel
+      - development
   schedule:
     - cron: "0 0 * * 0"
 
diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml
index 2f707067..e15d1049 100644
--- a/.github/workflows/sync-back-to-dev.yml
+++ b/.github/workflows/sync-back-to-dev.yml
@@ -13,6 +13,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.7
       - name: Opening pull request
-        run: gh pr create -B devel -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
+        run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 95c1eefc..3d2586bf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ name: Tests
 on:
   push:
     branches:
-      - devel
+      - development
       - master
   pull_request:
     branches:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4a308af5..de32ff71 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,8 +31,8 @@ When requesting or submitting new features, first consider whether it might be u
 
 ## Technical Requirements
 
-- Submit Pull Requests to the **devel branch only**.
-- Before Submitting your Pull Request, merge `devel` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
+- Submit Pull Requests to the **development branch only**.
+- Before Submitting your Pull Request, merge `development` with your new branch and fix any conflicts. (Make sure you don't break anything in development!)
 - Commit Unix line endings.
 - Please use the Pi-hole brand: **Pi-hole** (Take a special look at the capitalized 'P' and a low 'h' with a hyphen)
 - (Optional fun) keep to the theme of Star Trek/black holes/gravity.