Merge branch 'feat-django-itsm' into 'development'

feat: django itsm

See merge request nofusscomputing/infrastructure/website!62

.gitlab-ci.yml

@@ -25,6 +25,10 @@ Get Project Documentation:
         ASSEMBLE_PROJECT_ID: 51640016
         ASSEMBLE_PROJECT_PATH: projects/ansible/collection/firewall
 
+      - ASSEMBLE_PROJECT_NAME: django_template
+        ASSEMBLE_PROJECT_ID: 57560288
+        ASSEMBLE_PROJECT_PATH: projects/django-template
+
       - ASSEMBLE_PROJECT_NAME: kubernetes
         ASSEMBLE_PROJECT_ID: 51640029
         ASSEMBLE_PROJECT_PATH: projects/ansible/collection/kubernetes

.gitlab/project_docs.gitlab-ci.yml

@@ -57,7 +57,11 @@
         )
           ||
         (
-          $CI_COMMIT_BRANCH == "development"
+          (
+            $CI_COMMIT_BRANCH == "development"
+              ||
+            $CI_COMMIT_BRANCH != "master"
+          )
             &&
           ( 
             $CI_PIPELINE_SOURCE == "pipeline"
@@ -131,7 +135,11 @@
         )
           ||
         (
-          $CI_COMMIT_BRANCH == "development"
+          (
+            $CI_COMMIT_BRANCH == "development"
+              ||
+            $CI_COMMIT_BRANCH != "master"
+          )
             &&
           ( 
             $CI_PIPELINE_SOURCE == "pipeline"

mkdocs.yml

@@ -97,6 +97,10 @@ nav:
     
       - projects/docker-mail/index.md
 
+  - Django ITSM:
+
+    - projects/django-template/index.md
+
   - Gitlab CI: projects/gitlab-ci/index.md
 
   - ITIL: