diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-04-30 11:28:43 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-04-30 11:28:43 -0400 |
| commit | b124c39ed256f69d59adf02fea9763781bbb0c88 (patch) | |
| tree | 269dbe55da3a32b6874b7bc871fe93d81a429656 /.config | |
| parent | fix type errors in e2e tests (diff) | |
| parent | merge: Added extra connection option and comment for statement_timeout - fix ... (diff) | |
| download | sharkey-b124c39ed256f69d59adf02fea9763781bbb0c88.tar.gz sharkey-b124c39ed256f69d59adf02fea9763781bbb0c88.tar.bz2 sharkey-b124c39ed256f69d59adf02fea9763781bbb0c88.zip | |
Merge branch 'develop' into merge/2025-03-24
Diffstat (limited to '.config')
| -rw-r--r-- | .config/ci.yml | 3 | ||||
| -rw-r--r-- | .config/cypress-devcontainer.yml | 3 | ||||
| -rw-r--r-- | .config/docker_example.yml | 3 | ||||
| -rw-r--r-- | .config/example.yml | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/.config/ci.yml b/.config/ci.yml index bb8e592a5f..b0b97e9471 100644 --- a/.config/ci.yml +++ b/.config/ci.yml @@ -121,6 +121,9 @@ db: # Extra Connection options #extra: # ssl: true + # # Set a higher value if you have timeout issues during migration + # statement_timeout: 10000 + dbReplications: false diff --git a/.config/cypress-devcontainer.yml b/.config/cypress-devcontainer.yml index fc58fbab72..83be98e429 100644 --- a/.config/cypress-devcontainer.yml +++ b/.config/cypress-devcontainer.yml @@ -63,6 +63,9 @@ db: # Extra Connection options #extra: # ssl: true + # # Set a higher value if you have timeout issues during migration + # statement_timeout: 10000 + dbReplications: false diff --git a/.config/docker_example.yml b/.config/docker_example.yml index 45cc157533..ee57da781f 100644 --- a/.config/docker_example.yml +++ b/.config/docker_example.yml @@ -124,6 +124,9 @@ db: # Extra Connection options #extra: # ssl: true + # # Set a higher value if you have timeout issues during migration + # statement_timeout: 10000 + dbReplications: false diff --git a/.config/example.yml b/.config/example.yml index c484e48e5d..704a80d413 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -127,6 +127,9 @@ db: # Extra Connection options #extra: # ssl: true + # # Set a higher value if you have timeout issues during migration + # statement_timeout: 10000 + dbReplications: false |