Merge pull request #177 from pi-hole/master

Update devel from master
2024-12-06 19:36:21 +01:00 · 2016-10-30 17:19:20 +00:00
parent 0b0750226c 3e6955d4a0
commit 778c842e07
3 changed files with 41 additions and 2 deletions
@@ -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
@@ -17,7 +17,7 @@
 <html>
 <head>
    <meta charset="UTF-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self' https://api.github.com; script-src 'self'; style-src 'self' 'unsafe-inline'">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' https://api.github.com; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'">
    <title>Pi-hole Admin Console</title>
    <!-- Tell the browser to be responsive to screen width -->
    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
@@ -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;