From e4405fbe2a21abb8de50cb1c3e6858c3b560cab0 Mon Sep 17 00:00:00 2001
From: Adam Warner <PromoFaux@users.noreply.github.com>
Date: Tue, 25 Oct 2016 09:27:22 +0100
Subject: [PATCH] Update .pullapprove.yml to V2

---
 .pullapprove.yml | 53 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/.pullapprove.yml b/.pullapprove.yml
index db3c0a90..bd9751dc 100644
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@@ -1,19 +1,42 @@
-approve_by_comment: true
-approve_regex: '^(Approved|:shipit:|:\+1:|Engage)'
-reject_regex: '^(Rejected|:-1:|Borg)'
-reset_on_push: true
-author_approval: required
-reviewers:
-  members:
-  - brantje
-  - dschaper
-  - jacobsalmela
-  - Mcat12
-  - PromoFaux
-  name: pullapprove
-  required: 3
+version: 2
+
 always_pending:
-  title_regex: '(WIP|wip)'
+  title_regex: '(WIP|wip)'  
   labels:
     - wip
   explanation: 'This PR is a work in progress...'
+
+group_defaults:
+  reset_on_push:
+    enabled: true
+  reject_value: -1
+  approve_by_comment:
+    enabled: true
+    approve_regex: '^(Approved|:shipit:|:\+1:|Engage)'
+
+groups:
+  development:
+    author_approval:
+      auto: true
+    conditions:
+      branches:
+        - development
+    required: 2
+    users:
+      - brantje
+      - dschaper
+      - jacobsalmela
+      - Mcat12
+      - PromoFaux
+  
+  development-master:
+    conditions:
+      branches:
+        - "master...development" # Only needed if merging into master from development
+    required: 1
+    users:
+      - brantje
+      - dschaper
+      - jacobsalmela
+      - Mcat12
+      - PromoFaux