mirror of
https://github.com/pi-hole/web.git
synced 2024-12-06 19:36:21 +01:00
update branch name in various other places from devel->development
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
@@ -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"
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ name: Tests
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- devel
|
||||
- development
|
||||
- master
|
||||
pull_request:
|
||||
branches:
|
||||
|
||||
+2
-2
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user