diff --git a/.pullapprove.yml b/.pullapprove.yml new file mode 100644 index 00000000..41dcfb0a --- /dev/null +++ b/.pullapprove.yml @@ -0,0 +1,38 @@ +version: 2 + +always_pending: + title_regex: '(WIP|wip)' + labels: + - wip + explanation: 'This PR is a work in progress...' + +group_defaults: + reset_on_push: + enabled: true + reject_value: -2 + approve_regex: '^(Approved|:shipit:|:\+1:|Engage)' + reject_regex: '^(Rejected|:-1:|Borg)' + author_approval: + auto: true + + +groups: + development: + approve_by_comment: + enabled: true + conditions: + branches: + - devel + required: 2 + teams: + - dashboard + + master: + approve_by_comment: + enabled: true + conditions: + branches: + - master + required: 3 + teams: + - dashboard diff --git a/header.php b/header.php index 344d13c2..52378f1f 100644 --- a/header.php +++ b/header.php @@ -17,7 +17,7 @@ - + Pi-hole Admin Console diff --git a/list.php b/list.php index 0b6e245b..32f4e611 100644 --- a/list.php +++ b/list.php @@ -4,10 +4,11 @@ require "header.php"; $list = $_GET['l']; -if($list !== "white" && $list !== "black") +if($list !== "white" && $list !== "black"){ echo "Invalid list parameter"; require "footer.php"; die(); +} function getFullName() { global $list;