Merge pull request #343 from DefGuard/dev

merge dev into main
DefGuard · Sep 18, 2023 · 8ef4109 · 8ef4109
2 parents ce45776 + 4d2b380
commit 8ef4109
Show file tree

Hide file tree

Showing 309 changed files with 6,848 additions and 7,255 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,23 +6,23 @@ on:
       - main
       - dev
     paths-ignore:
-      - '*.md'
-      - 'LICENSE'
+      - "*.md"
+      - "LICENSE"
   pull_request:
     branches:
       - main
       - dev
     paths-ignore:
-      - '*.md'
-      - 'LICENSE'
+      - "*.md"
+      - "LICENSE"
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   test:
     runs-on: self-hosted
-    container: rust:1.71
+    container: rust:1.72
 
     services:
       postgres:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -4,8 +4,8 @@ on:
     branches:
       - main
     paths-ignore:
-      - '*.md'
-      - 'LICENSE'
+      - "*.md"
+      - "LICENSE"
 
 env:
   CARGO_INCREMENTAL: 0
@@ -16,10 +16,10 @@ env:
 jobs:
   rustdoc:
     runs-on: self-hosted
-    container: rust:1.71
+    container: rust:1.72
     services:
       postgres:
-        image: postgres:14-alpine
+        image: postgres:15-alpine
         env:
           POSTGRES_DB: defguard
           POSTGRES_USER: defguard

diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ dist-ssr
 build
 ladle-build
 .idea/
+.vscode/
diff --git a/.sqlx/query-0377049270e6dcc4f0ec3571bd998dcdbab8366524ff1f20f48a208b9f7dd9c6.json b/.sqlx/query-0377049270e6dcc4f0ec3571bd998dcdbab8366524ff1f20f48a208b9f7dd9c6.json
diff --git a/.sqlx/query-05e3fce0c51856f6033195c7523a2b5fd1c2a7968a7abd27394422a7c93e8815.json b/.sqlx/query-05e3fce0c51856f6033195c7523a2b5fd1c2a7968a7abd27394422a7c93e8815.json
diff --git a/.sqlx/query-06be7b39c87c3a1d1465dfb007937b5b584f60e9094a18936b482c4dfb6b1aca.json b/.sqlx/query-06be7b39c87c3a1d1465dfb007937b5b584f60e9094a18936b482c4dfb6b1aca.json
diff --git a/.sqlx/query-06f847d99d452dafd10f4a6bec309c330d76eb5d0a34012bd75395b13e3ff659.json b/.sqlx/query-06f847d99d452dafd10f4a6bec309c330d76eb5d0a34012bd75395b13e3ff659.json
diff --git a/.sqlx/query-0739dda752a2a5b4bb6483d8fdc87b7065d01d6d5990c7d344be2d0068cac835.json b/.sqlx/query-0739dda752a2a5b4bb6483d8fdc87b7065d01d6d5990c7d344be2d0068cac835.json
diff --git a/.sqlx/query-087a0d357b61dd2266e804982fba2e6ca06a3f95da3225be6fcc38d324c143e7.json b/.sqlx/query-087a0d357b61dd2266e804982fba2e6ca06a3f95da3225be6fcc38d324c143e7.json
diff --git a/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json b/.sqlx/query-0ad599ef120ecc02b030bd1276172929d6a612846acf4a5489c36a04cb57de59.json
diff --git a/.sqlx/query-0b53e81d6f1ce3c3a68c871e7a4b9e41db58b112d12281516e10421d46fbbd94.json b/.sqlx/query-0b53e81d6f1ce3c3a68c871e7a4b9e41db58b112d12281516e10421d46fbbd94.json
diff --git a/.sqlx/query-0b64dc92dc09d7fc080c6d2f2d016db4c11f9a99442428a9e473c75c7633927b.json b/.sqlx/query-0b64dc92dc09d7fc080c6d2f2d016db4c11f9a99442428a9e473c75c7633927b.json