Merge branch 'master' into remove-name-field

modrinth · Aug 22, 2024 · 91d081c · 91d081c
2 parents 658701a + 637a923
commit 91d081c
Show file tree

Hide file tree

Showing 69 changed files with 4,189 additions and 1,070 deletions.
diff --git a/.env b/.env
@@ -84,6 +84,7 @@ SMTP_HOST=none
 
 SITE_VERIFY_EMAIL_PATH=none
 SITE_RESET_PASSWORD_PATH=none
+SITE_BILLING_PATH=none
 
 BEEHIIV_PUBLICATION_ID=none
 BEEHIIV_API_KEY=none
@@ -99,4 +100,7 @@ MAXMIND_LICENSE_KEY=none
 
 PAYOUTS_BUDGET=100
 
-FLAME_ANVIL_URL=none
+FLAME_ANVIL_URL=none
+
+STRIPE_API_KEY=none
+STRIPE_WEBHOOK_SECRET=none
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -18,7 +18,7 @@ jobs:
 
       # Start Docker Compose
       - name: Start Docker Compose
-        run: docker-compose up -d
+        run: docker compose up -d
 
       - name: Install cargo tarpaulin
         uses: taiki-e/install-action@cargo-tarpaulin

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -26,7 +26,7 @@ jobs:
 
       # Start Docker Compose
       - name: Start Docker Compose
-        run: docker-compose up -d
+        run: docker compose up -d
 
       - uses: actions-rs/toolchain@v1
         name: Install toolchain

diff --git a/.sqlx/query-07afad3b85ed64acbe9584570fdec92f923abf17439f0011e2b46797cec0ad97.json b/.sqlx/query-07afad3b85ed64acbe9584570fdec92f923abf17439f0011e2b46797cec0ad97.json
diff --git a/.sqlx/query-37da053e79c32173d7420edbe9d2f668c8bf7e00f3ca3ae4abd60a7aa36c943b.json b/.sqlx/query-37da053e79c32173d7420edbe9d2f668c8bf7e00f3ca3ae4abd60a7aa36c943b.json
diff --git a/.sqlx/query-4065dd9c79f220db9daa3e162d791eeeddd9b913fb848602dca5e35570a56b27.json b/.sqlx/query-4065dd9c79f220db9daa3e162d791eeeddd9b913fb848602dca5e35570a56b27.json
diff --git a/.sqlx/query-494610831c7303d9cb3c033ff94af80fcc428014795c719fcafe1272db2c0177.json b/.sqlx/query-494610831c7303d9cb3c033ff94af80fcc428014795c719fcafe1272db2c0177.json
diff --git a/.sqlx/query-53845c65f224a5ab0526d2d02806bd82ee2c40bb32bbb1a72c3a625853caeed8.json b/.sqlx/query-53845c65f224a5ab0526d2d02806bd82ee2c40bb32bbb1a72c3a625853caeed8.json
diff --git a/.sqlx/query-61a87b00baaba022ab32eedf177d5b9dc6d5b7568cf1df15fac6c9e85acfa448.json b/.sqlx/query-61a87b00baaba022ab32eedf177d5b9dc6d5b7568cf1df15fac6c9e85acfa448.json