Merge branch 'main' into dev

.github/pull_request_template.md

@@ -1,18 +1,32 @@
-# Description
+## 📖 Description
 
-Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change.
+1. include a **summary of the changes and the related issue**, eg. _Closes #XYZ_
+2. Do not make a PR if you can't check **all the boxes below**
 
-# Dev Branch Merge Checklist:
+### 🛠️ Dev Branch Merge Checklist:
+
+#### Documentation ###
+
+- [ ] If testing requires changes in the environment or deployment, please **update the documentation** (https://defguard.gitbook.io) first and **attach the link to the documentation** section in this pool request
+- [ ] I have commented on my code, particularly in hard-to-understand areas
+
+#### Testing ### 
 
 - [ ] I have prepared end-to-end tests for all new functionalities
 - [ ] I have performed end-to-end tests manually and they work
 - [ ] New and existing unit tests pass locally with my changes
-- [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have made corresponding/required changes to [deployment](https://github.com/defguard/deployment) (Docker, Kubernetes, one-line install)
-- [ ] My changes generate no new warnings
 
-# Main Branch Merge Checklist:
+#### Deployment ###
+
+- [ ] If deployment is affected I have made corresponding/required changes to [deployment](https://github.com/defguard/deployment) (Docker, Kubernetes, one-line install)
+
+### 🏚️ Main Branch Merge Checklist:
+
+#### Testing ### 
 
 - [ ] I have merged my changes before to dev and the dev checklist is done
 - [ ] I have tested all functionalities on the dev instance and they work
-- [ ] I have made corresponding changes to the documentation and added new features documentation with screenshots for users/admins
+
+#### Documentation ###
+
+- [ ] I have made corresponding changes to the **user & admin documentation** and added new features documentation with screenshots for users/admins

.github/workflows/e2e.yml

@@ -45,6 +45,8 @@ jobs:
             ${{ runner.os }}-pnpm-store-
       - name: Pull images
         run: docker compose --file './docker-compose.e2e.yaml' pull
+      - name: Start compose
+        run: docker compose --file './docker-compose.e2e.yaml' up -d
       - name: Install E2E dependencies
         working-directory: ./e2e
         run: pnpm install --frozen-lockfile