From fba2a34c050dc3a39178af23daa7a2df19f13359 Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Thu, 1 Jul 2021 20:03:45 +0200 Subject: [PATCH 1/2] Fix redirected link in Charts doc --- doc/troubleshooting/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/troubleshooting/index.md b/doc/troubleshooting/index.md index d14ccd27c5..e81c964139 100644 --- a/doc/troubleshooting/index.md +++ b/doc/troubleshooting/index.md @@ -265,7 +265,7 @@ gitlab-postgresql FATAL: database files are incompatible with server gitlab-postgresql DETAIL: The data directory was initialized by PostgreSQL version 11, which is not compatible with this version 12.7. ``` -To address this, perform a [Helm rollback](https://helm.sh/docs/helm/helm_rollback) to the previous version of the chart and then follow the steps in the [upgrade guide](../installation/upgrade.md) to upgrade the bundled PostgreSQL version. Once PostgreSQL is properly upgraded, try the GitLab Helm chart upgrade again. +To address this, perform a [Helm rollback](https://helm.sh/docs/helm/helm_rollback/) to the previous version of the chart and then follow the steps in the [upgrade guide](../installation/upgrade.md) to upgrade the bundled PostgreSQL version. Once PostgreSQL is properly upgraded, try the GitLab Helm chart upgrade again. ## Increased load on `/api/v4/jobs/requests` endpoint -- GitLab From 99ca651cb1ffe89cecb0d4342bb3315b30b228c0 Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Thu, 1 Jul 2021 20:06:43 +0200 Subject: [PATCH 2/2] Split long line in doc --- doc/troubleshooting/index.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/troubleshooting/index.md b/doc/troubleshooting/index.md index e81c964139..5da9a2c76b 100644 --- a/doc/troubleshooting/index.md +++ b/doc/troubleshooting/index.md @@ -265,7 +265,10 @@ gitlab-postgresql FATAL: database files are incompatible with server gitlab-postgresql DETAIL: The data directory was initialized by PostgreSQL version 11, which is not compatible with this version 12.7. ``` -To address this, perform a [Helm rollback](https://helm.sh/docs/helm/helm_rollback/) to the previous version of the chart and then follow the steps in the [upgrade guide](../installation/upgrade.md) to upgrade the bundled PostgreSQL version. Once PostgreSQL is properly upgraded, try the GitLab Helm chart upgrade again. +To address this, perform a [Helm rollback](https://helm.sh/docs/helm/helm_rollback/) to the previous +version of the chart and then follow the steps in the [upgrade guide](../installation/upgrade.md) to +upgrade the bundled PostgreSQL version. Once PostgreSQL is properly upgraded, try the GitLab Helm +chart upgrade again. ## Increased load on `/api/v4/jobs/requests` endpoint -- GitLab