Merge branch 'master' into en-dash-versions-range

modrinth · Oct 1, 2024 · 030ed77 · 030ed77
2 parents 5d02c8c + 28b6bf8
commit 030ed77
Show file tree

Hide file tree

Showing 161 changed files with 6,808 additions and 2,924 deletions.
diff --git a/.env b/.env
@@ -20,7 +20,7 @@ REDIS_MAX_CONNECTIONS=10000
 BIND_ADDR=127.0.0.1:8000
 SELF_ADDR=http://127.0.0.1:8000
 
-MODERATION_DISCORD_WEBHOOK=
+MODERATION_SLACK_WEBHOOK=
 PUBLIC_DISCORD_WEBHOOK=
 CLOUDFLARE_INTEGRATION=false
 
@@ -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
@@ -97,6 +98,9 @@ CLICKHOUSE_DATABASE=staging_ariadne
 
 MAXMIND_LICENSE_KEY=none
 
-PAYOUTS_BUDGET=100
+FLAME_ANVIL_URL=none
 
-FLAME_ANVIL_URL=none
+STRIPE_API_KEY=none
+STRIPE_WEBHOOK_SECRET=none
+
+ADITUDE_API_KEY=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-0379424a41b12db94c7734086fca5b96c8cdfe0a9f9c00e5c67e6b95a33c8c6b.json b/.sqlx/query-0379424a41b12db94c7734086fca5b96c8cdfe0a9f9c00e5c67e6b95a33c8c6b.json
diff --git a/...30ead9fe7883d283e08a46155382e7a6c163.json → ...849a3ff19649835bcdb1d44697d9a229725a.json b/...30ead9fe7883d283e08a46155382e7a6c163.json → ...849a3ff19649835bcdb1d44697d9a229725a.json
diff --git a/.sqlx/query-070174adf972b808aca7519168719e6c7b762bfbcc09d8ab2624b00113f71e77.json b/.sqlx/query-070174adf972b808aca7519168719e6c7b762bfbcc09d8ab2624b00113f71e77.json
diff --git a/.sqlx/query-07afad3b85ed64acbe9584570fdec92f923abf17439f0011e2b46797cec0ad97.json b/.sqlx/query-07afad3b85ed64acbe9584570fdec92f923abf17439f0011e2b46797cec0ad97.json
diff --git a/.sqlx/query-0a31f7b04f4b68c556bdbfe373ef7945741f915d4ae657363fe67db46e8bd4cf.json b/.sqlx/query-0a31f7b04f4b68c556bdbfe373ef7945741f915d4ae657363fe67db46e8bd4cf.json
diff --git a/.sqlx/query-0bd68c1b7c90ddcdde8c8bbd8362c6d0c7fb15e375d734bf34c365e71d623780.json b/.sqlx/query-0bd68c1b7c90ddcdde8c8bbd8362c6d0c7fb15e375d734bf34c365e71d623780.json
diff --git a/.sqlx/query-0eb293a353be47c61620922634cc339eda0e2422fcc602d7506c7cdf6152c928.json b/.sqlx/query-0eb293a353be47c61620922634cc339eda0e2422fcc602d7506c7cdf6152c928.json
diff --git a/.sqlx/query-1280600bf1bf7b4f0d19d0de0ca5adc8115925320edc35d189bf177ad2b7317a.json b/.sqlx/query-1280600bf1bf7b4f0d19d0de0ca5adc8115925320edc35d189bf177ad2b7317a.json
diff --git a/.sqlx/query-1ab781d26c93aa74bf90b78b74b99e50004d25d42d56b734e5e83f2333d0c0d2.json b/.sqlx/query-1ab781d26c93aa74bf90b78b74b99e50004d25d42d56b734e5e83f2333d0c0d2.json
diff --git a/.sqlx/query-1d09169d25a30f4495778b0695ac00e48d682db15963a01195bbd5f981178ce9.json b/.sqlx/query-1d09169d25a30f4495778b0695ac00e48d682db15963a01195bbd5f981178ce9.json