Merge branch 'dev' of github.com:DefGuard/defguard into dev

DefGuard · Jan 23, 2024 · eaad709 · eaad709
2 parents c61b413 + 6a0c222
commit eaad709
Show file tree

Hide file tree

Showing 148 changed files with 4,003 additions and 2,402 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ env:
 jobs:
   test:
     runs-on: [self-hosted, Linux]
-    container: rust:1.74
+    container: rust:1.75
 
     services:
       postgres:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   rustdoc:
     runs-on: [self-hosted, Linux]
-    container: rust:1.74
+    container: rust:1.75
     services:
       postgres:
         image: postgres:15-alpine

diff --git a/...c657d3018d01be7e095683a40160d533f410.json → ...fb648b288f49586113cea21d889dca9655b9.json b/...c657d3018d01be7e095683a40160d533f410.json → ...fb648b288f49586113cea21d889dca9655b9.json
diff --git a/...38ceab97af014b51bfa24933e296e803effc.json → ...87a85eb04e2b0eec2d9bc63e8fee6abda27e.json b/...38ceab97af014b51bfa24933e296e803effc.json → ...87a85eb04e2b0eec2d9bc63e8fee6abda27e.json
diff --git a/.sqlx/query-06d1ac982dc99c5dae010089cfb73a044397c5cb6bb9654dc5df420bf00d2955.json b/.sqlx/query-06d1ac982dc99c5dae010089cfb73a044397c5cb6bb9654dc5df420bf00d2955.json
diff --git a/...3d7d15049caf771aec6b0fcd42bea7169998.json → ...40442a7ed65c986eef4e79e9d12aeb32edef.json b/...3d7d15049caf771aec6b0fcd42bea7169998.json → ...40442a7ed65c986eef4e79e9d12aeb32edef.json
diff --git a/.sqlx/query-0cf5e325412549a381f4a2309ccbdc9289ef5ce5169c5b8c853e7c4e7dfb1877.json b/.sqlx/query-0cf5e325412549a381f4a2309ccbdc9289ef5ce5169c5b8c853e7c4e7dfb1877.json
diff --git a/.sqlx/query-0fa037b89c50e40ad95ae203cf70fe9162b8ae22444b29379c85fe0b9ca01799.json b/.sqlx/query-0fa037b89c50e40ad95ae203cf70fe9162b8ae22444b29379c85fe0b9ca01799.json
diff --git a/.sqlx/query-1a01b8b88444b493abf74b2ec0ad649018244de3c7f23d98bfab71faa1a9fae1.json b/.sqlx/query-1a01b8b88444b493abf74b2ec0ad649018244de3c7f23d98bfab71faa1a9fae1.json
diff --git a/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json b/.sqlx/query-1bb3c8ecbd6500717d639678e08ab52c14293fa64d260db812c89ed43a5a7cc8.json
diff --git a/...dd239be2168c4afdfc618de4c7facaad67a3.json → ...4f48275d7b1d588869791a6741fa11be38a5.json b/...dd239be2168c4afdfc618de4c7facaad67a3.json → ...4f48275d7b1d588869791a6741fa11be38a5.json
diff --git a/.sqlx/query-26d95a39c9d11c1fcd5d35f4f0d8883b366b46937b94f25a3788604c72da0ecc.json b/.sqlx/query-26d95a39c9d11c1fcd5d35f4f0d8883b366b46937b94f25a3788604c72da0ecc.json
diff --git a/...01c7f94ba91677af351ef235755bf804e1f7.json → ...aeeaeb3b13a524f503b21414d1394173eb24.json b/...01c7f94ba91677af351ef235755bf804e1f7.json → ...aeeaeb3b13a524f503b21414d1394173eb24.json
diff --git a/...a58be7427882b368eef4d45529e9e85d885c.json → ...3e209cf075f9b128ed33908c73cd74297d81.json b/...a58be7427882b368eef4d45529e9e85d885c.json → ...3e209cf075f9b128ed33908c73cd74297d81.json
diff --git a/.sqlx/query-3d5d8b6f640435a1986561c73cd809038cdddfb44133b97b5ba7392573239539.json b/.sqlx/query-3d5d8b6f640435a1986561c73cd809038cdddfb44133b97b5ba7392573239539.json