wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-02 05:09:26 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into staging-new

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2025-02-13 01:47:57 +07:00
commit 82a2f4bb5c
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -156,7 +156,7 @@ jobs:
[ -z "$(git diff --name-only '*.js' '*.ts' '*.svelte' '*.json' '*.yaml' | cat)" ]
echo '================================================================'
- name: Formatting...
run: node common/scripts/install-run-rush.js fast-format --branch ${{ github.base_ref }}
run: node common/scripts/install-run-rush.js fast-format --branch ${{ github.base_ref || 'develop' }}
- name: Check files formatting
run: |
echo '================================================================'

2
server/account/src/collections/postgres.ts
View File

@ -560,7 +560,7 @@ export class PostgresAccountDB implements AccountDB {
operationSql = `(${pendingCreationSql} OR ${pendingUpgradeSql})`
break
case 'all+backup':
operationSql = `(${pendingCreationSql} OR ${pendingUpgradeSql} OR ${migrationSql} OR ${archivingSql} OR ${restoringSql}) OR ${deletingSql}`
operationSql = `(${pendingCreationSql} OR ${pendingUpgradeSql} OR ${migrationSql} OR ${archivingSql} OR ${restoringSql} OR ${deletingSql})`
break
}

1
server/core/src/types.ts
View File

@ -647,6 +647,7 @@ export interface AddSessionActive {
context: MeasureContext
workspaceId: WorkspaceUuid
}
export type AddSessionResponse =
| AddSessionActive
| { upgrade: true, progress?: number }