Merge remote-tracking branch 'origin/develop' into more-fixes
This commit is contained in:
commit
6810d0fb9f
127 changed files with 4929 additions and 5175 deletions
|
|
@ -73,7 +73,7 @@ test:
|
|||
|
||||
e2e-pleroma:
|
||||
stage: test
|
||||
image: mcr.microsoft.com/playwright:v1.57.0-jammy
|
||||
image: mcr.microsoft.com/playwright:v1.61.0-jammy
|
||||
services:
|
||||
- name: postgres:15-alpine
|
||||
alias: db
|
||||
|
|
@ -175,7 +175,7 @@ e2e-pleroma:
|
|||
NOTIFY_EMAIL: $E2E_ADMIN_EMAIL
|
||||
VITE_PROXY_TARGET: http://pleroma:4000
|
||||
VITE_PROXY_ORIGIN: http://localhost:4000
|
||||
E2E_BASE_URL: http://localhost:8080
|
||||
E2E_BASE_URL: http://localhost:8099
|
||||
script:
|
||||
- npm install -g yarn@1.22.22
|
||||
- yarn --frozen-lockfile
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue