Sync master back into development

.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: devel
-  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"

.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"
 

.github/workflows/sync-back-to-dev.yml

@@ -13,6 +13,6 @@ jobs:
       - name: Checkout
         uses: actions/[email protected]
       - 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 }}

.github/workflows/test.yml

@@ -3,7 +3,7 @@ name: Tests
 on:
   push:
     branches:
-      - devel
+      - development
       - master
   pull_request:
     branches:

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.