From 2e38877d4068017e2414b8e30080551b9f23ec84 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Tue, 25 Oct 2016 13:28:28 +0100 Subject: [PATCH 1/3] Create .pullapprove.yml reflect changes in main pi-hole repo --- .pullapprove.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .pullapprove.yml 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 From c5d9fd526cd421220e86cbc774ec083ac6a5cebc Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 30 Oct 2016 01:59:36 +0000 Subject: [PATCH 2/3] This fixes the graphs --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 3e6955d4a01d78bb8c73a8f9fcec6d3be51bea4c Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 30 Oct 2016 02:26:08 +0000 Subject: [PATCH 3/3] Update list.php --- list.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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;