diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-04-30 15:18:56 +0000 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-04-30 15:18:56 +0000 |
| commit | da7dbd02f420fa9c883a3a05d4196deeecdf933c (patch) | |
| tree | 2fc5e58aa695cd6ff9efc281f7575383d2634a3f | |
| parent | merge: Merge stable into develop (!971) (diff) | |
| parent | #1042 - Added extra connection option and comment for statement_timeout (diff) | |
| download | sharkey-da7dbd02f420fa9c883a3a05d4196deeecdf933c.tar.gz sharkey-da7dbd02f420fa9c883a3a05d4196deeecdf933c.tar.bz2 sharkey-da7dbd02f420fa9c883a3a05d4196deeecdf933c.zip | |
merge: Added extra connection option and comment for statement_timeout - fix #1042 (!972)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/972
Closes #1042
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
| -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 2126f76337..d3f86ab622 100644 --- a/.config/ci.yml +++ b/.config/ci.yml @@ -50,6 +50,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 9e4961c325..3fd45593b1 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 acbaec8023..e30cc09928 100644 --- a/.config/docker_example.yml +++ b/.config/docker_example.yml @@ -110,6 +110,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 08a5680c41..64d2f2e655 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 |