From 48856955db7cb2a53ea8988e5e31478620ad7fe5 Mon Sep 17 00:00:00 2001 From: Craig Norris <cnorris@gitlab.com> Date: Tue, 9 Mar 2021 17:41:22 +0000 Subject: [PATCH] Minor wording updates --- doc/install/postgresql_extensions.md | 4 ++-- doc/install/requirements.md | 10 +++++----- doc/update/upgrading_from_source.md | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/install/postgresql_extensions.md b/doc/install/postgresql_extensions.md index cd70ca742027c..8d5a2a79b72aa 100644 --- a/doc/install/postgresql_extensions.md +++ b/doc/install/postgresql_extensions.md @@ -9,10 +9,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w This guide documents how to manage PostgreSQL extensions for installations with an external PostgreSQL database. -The following extensions must be loaded into the GitLab database. +The following extensions must be loaded into the GitLab database: | Extension | Minimum GitLab version | -| ------------ | ---------------------- | +|--------------|------------------------| | `pg_trgm` | 8.6 | | `btree_gist` | 13.1 | diff --git a/doc/install/requirements.md b/doc/install/requirements.md index f0e9e5374f36c..a1343dd5f981d 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -152,16 +152,16 @@ MySQL/MariaDB are advised to [migrate to PostgreSQL](../update/mysql_to_postgres The server running PostgreSQL should have _at least_ 5-10 GB of storage available, though the exact requirements [depend on the number of users](../administration/reference_architectures/index.md). -We highly recommend users to use the minimum PostgreSQL versions specified in -the following table as these are the versions used for development and testing. +We highly recommend using the minimum PostgreSQL versions (as specified in +the following table) as these were used for development and testing: | GitLab version | Minimum PostgreSQL version | -| -------------- | -------------------------- | +|----------------|----------------------------| | 10.0 | 9.6 | | 13.0 | 11 | You must also ensure the following extensions are [loaded into every -GitLab database](postgresql_extensions.html). +GitLab database](postgresql_extensions.html): | Extension | Minimum GitLab version | | ------------ | ---------------------- | @@ -169,7 +169,7 @@ GitLab database](postgresql_extensions.html). | `btree_gist` | 13.1 | NOTE: -Support for [PostgreSQL 9.6 and 10 has been removed in GitLab 13.0](https://about.gitlab.com/releases/2020/05/22/gitlab-13-0-released/#postgresql-11-is-now-the-minimum-required-version-to-install-gitlab) so that GitLab can benefit from PostgreSQL 11 improvements, such as partitioning. For the schedule of transitioning to PostgreSQL 12, see [the related epic](https://gitlab.com/groups/gitlab-org/-/epics/2184). +Support for [PostgreSQL 9.6 and 10 was removed in GitLab 13.0](https://about.gitlab.com/releases/2020/05/22/gitlab-13-0-released/#postgresql-11-is-now-the-minimum-required-version-to-install-gitlab) so that GitLab can benefit from PostgreSQL 11 improvements, such as partitioning. For the schedule of transitioning to PostgreSQL 12, see [the related epic](https://gitlab.com/groups/gitlab-org/-/epics/2184). #### Additional requirements for GitLab Geo diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md index 4245de0c9032e..2b141d87b1b1b 100644 --- a/doc/update/upgrading_from_source.md +++ b/doc/update/upgrading_from_source.md @@ -168,11 +168,11 @@ WARNING: From GitLab 13.0, you must use at least PostgreSQL 11. The latest version of GitLab might depend on a more recent PostgreSQL version -than what you are currently running. You might also need to enable some -extensions. See the [PostgreSQL requirements](../install/requirements.md#postgresql-requirements) -for more information. +than what you're currently running. You may also need to enable some +extensions. For more information, see the +[PostgreSQL requirements](../install/requirements.md#postgresql-requirements) -In order to upgrade PostgreSQL, refer to its [documentation](https://www.postgresql.org/docs/11/upgrading.html). +To upgrade PostgreSQL, refer to its [documentation](https://www.postgresql.org/docs/11/upgrading.html). ### 8. Get latest code -- GitLab