From c7dcf6235335c3abebdd4111b685e80842b21534 Mon Sep 17 00:00:00 2001
From: Alexander Davis <alex@adcm.uk>
Date: Mon, 10 Aug 2020 14:16:52 +0100
Subject: [PATCH 1/2] Fixed broken existing

---
 app/public/actions/close.php | 2 +-
 app/public/existing.php      | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/public/actions/close.php b/app/public/actions/close.php
index 4e9bc4a..18a4ec5 100644
--- a/app/public/actions/close.php
+++ b/app/public/actions/close.php
@@ -10,7 +10,7 @@
     if ($is_authorised == true) {
         if($_SERVER['REQUEST_METHOD'] == 'POST') {
           try {
-              $stmt = "UPDATE tickets SET status= 5 WHERE uuid=:uuid";
+              $stmt = "UPDATE tickets SET status='Closed' WHERE uuid=:uuid";
               $sql = $db->prepare($stmt);
               $sql->bindParam(':uuid', $request['uuid']);
               $sql->execute();
diff --git a/app/public/existing.php b/app/public/existing.php
index 04c7341..3b8debc 100644
--- a/app/public/existing.php
+++ b/app/public/existing.php
@@ -3,11 +3,14 @@
     require_once __DIR__ . "/../includes/header.php";
 
     if (is_signed_in()) {
-      $open_requests = array();
-      $closed_requests = array();
+      $closed_requests =  get_my_open_requests($db);
       $subscriptions = get_subscribed_requests($db);
+<<<<<<< Updated upstream
 
       $requests = get_my_requests($db);
+=======
+      $open_requests = get_my_open_requests($db);
+>>>>>>> Stashed changes
 
       foreach($requests as $req) {
         if ($req['status'] != "Closed") {
-- 
2.49.1


From 34fb717a4e2a5b839cd279d6cc4c59839e93b0f3 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Mon, 10 Aug 2020 14:31:46 +0100
Subject: [PATCH 2/2] Update way that branches are named

---
 .github/issue-branch.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/issue-branch.yml b/.github/issue-branch.yml
index 73aa54f..4415ab1 100644
--- a/.github/issue-branch.yml
+++ b/.github/issue-branch.yml
@@ -1,9 +1,11 @@
 mode: auto
 silent: false
-branchName: short
+branchName: '${issue.number}'
 branches:
   - label: type/feature
     prefix: feature/
   - label: type/bug
     prefix: bug/
+  - label: type/epic
+    prefix: epic/
 autoCloseIssue: true
-- 
2.49.1