From 8147d0db77267cfac06e958fc31fa0c3335e3ea8 Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@pm.me>
Date: Sun, 6 Jun 2021 14:07:25 +0930
Subject: [PATCH 1/4] added some links and removed old borked ones

---
 src/app/shared/models/links.model.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/app/shared/models/links.model.ts b/src/app/shared/models/links.model.ts
index e11796f..b6f7547 100644
--- a/src/app/shared/models/links.model.ts
+++ b/src/app/shared/models/links.model.ts
@@ -15,14 +15,6 @@ export const Links: Array<Link> =
         name: "gitlab",
         location: "https://gitlab.inkletblot.com/"
     },
-    {
-        name: "forum",
-        location: "https://www.inkletblot.com/forum/"
-    },
-    {
-        name: "books",
-        location: "https://www.inkletblot.com/books/"
-    },
     {
         name: "known",
         location: "https://www.inkletblot.com/known/"
@@ -31,20 +23,28 @@ export const Links: Array<Link> =
         name: "tng",
         location: "https://www.inkletblot.com/tng/"
     },
-    {
-        name: "pico",
-        location: "https://www.inkletblot.com/pico/"
-    },
     {
         name: "pasty",
         location: "https://www.inkletblot.com/pasty/"
     },
     {
         name: "mail",
-        location: "https://www.inkletblot.com/webmail/"
+        location: "https://mail.inkletblot.com/"
     },
     {
         name: "chk",
         location: "https://www.chkseven.com"
+    },
+    {
+        name: "pve",
+        location: "https://pve.inkletblot.com:8006/"
+    },
+    {
+        name: "bitwarden",
+        location: "https://bw.inkletblot.com/"
+    },
+    {
+        name: "matrix",
+        location: "https://homeserver.inkletblot.com/"
     }
 ]
\ No newline at end of file

From ff1e72b3df75d4163f84ba97fc4e13a8fd3d6d5a Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@pm.me>
Date: Sun, 6 Jun 2021 14:12:46 +0930
Subject: [PATCH 2/4] added merge only ci test

---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0081c9..b0606fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
   - build
   - deploy
+  -test
 
 develop-build-job:
   stage: build
@@ -48,3 +49,10 @@ deploy-job:
     - ssh -p "$Live_Server_Access_Port" "$Live_Server_User"@"$Live_Server_IP" "rm -Rf /var/www/html/inkletblot-com_old && mv /var/www/html/inkletblot-com /var/www/html/inkletblot-com_old && mkdir /var/www/html/inkletblot-com_build && mkdir /var/www/html/inkletblot-com && tar zxf /var/www/html/inkletblot-com.tar.gz -C /var/www/html/inkletblot-com_build && mv /var/www/html/inkletblot-com_build/dist/inkletblot-com/* /var/www/html/inkletblot-com && rm -Rf /var/www/html/inkletblot-com_build && chmod -R 755 /var/www/html/inkletblot-com && exit"
   only:
     - master
+
+test:
+  stage: test
+  script: 
+    - echo "I don't care about standard merges into dev as a build has to happen for a merge into master, I don't think there is a way to specify that so I need this here."
+  only:
+    - merge_requests

From 17c578a1e23be8a6644246b559ba212bdff447ee Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@pm.me>
Date: Sun, 6 Jun 2021 14:16:24 +0930
Subject: [PATCH 3/4] added merge only ci test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0606fc..faf1c3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
   - build
   - deploy
-  -test
+  - test
 
 develop-build-job:
   stage: build

From 8ea795def4423a26f0a3cbe4bd4089730569d734 Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@pm.me>
Date: Sun, 6 Jun 2021 14:17:20 +0930
Subject: [PATCH 4/4] added merge only ci test

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index faf1c3e..c77337e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,6 +52,8 @@ deploy-job:
 
 test:
   stage: test
+  tags:
+    - node
   script: 
     - echo "I don't care about standard merges into dev as a build has to happen for a merge into master, I don't think there is a way to specify that so I need this here."
   only: