Merge branch 'development' of https://git.baumann.gr/adebaumann/vgui-cicd into development

.gitea/workflows/build-on-demand.yml

@@ -2,9 +2,9 @@ name: Build image when workload image tag changes
 
 on:
   push:
-    branches: [ deployment ]                 # adjust if needed
+    branches: [ development ]                 # adjust if needed
     paths:
-      - "arcocd/deployment.yaml"
+      - "argocd/deployment.yaml"
       - "Dockerfile"                   # keep if you also want to rebuild when Dockerfile changes
 
 jobs:
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      DEPLOY_FILE: "arcocd/deployment.yaml"
+      DEPLOY_FILE: "argocd/deployment.yaml"
       TARGET_REPO: "git.baumann.gr/adebaumann/vui"   # repo (no tag)
 
     steps:

.gitignore

@@ -9,9 +9,10 @@ keys/
 .venv/
 .idea/
 *.kate-swp
-media/diagram_cache/
-.env
 node_modules/
 package-lock.json
 package.json
+# Diagram cache directory
+media/diagram_cache/
+.env
 data/db.sqlite3

README.md

@@ -2,8 +2,5 @@
 
 There are examples for importing text in the "Documentation"-directory. Actual documentation follows.
 
-<<<<<<< HEAD
 Documentation on Confluence so far.
 This commit should be signed.
-=======
->>>>>>> 299c046 (Readme added)