diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-08 06:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-08 06:09:21 +0300 |
| commit | a6db6a23d11a981c6d1fd6b875be863a6c36d934 (patch) | |
| tree | 148a9ad5fdf04b511fabe74c7e1ffc41fe92659b /doc/administration/package_information | |
| parent | 00871a937dabdf0a100e465c2820e69b82556898 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/package_information')
| -rw-r--r-- | doc/administration/package_information/postgresql_versions.md | 3 | ||||
| -rw-r--r-- | doc/administration/package_information/supported_os.md | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/administration/package_information/postgresql_versions.md b/doc/administration/package_information/postgresql_versions.md index e208f9dc935..d831e8cea7f 100644 --- a/doc/administration/package_information/postgresql_versions.md +++ b/doc/administration/package_information/postgresql_versions.md @@ -20,8 +20,7 @@ For example: - Omnibus 12.7.6 shipped with PostgreSQL 9.6.14 and 10.9. - Omnibus 12.7.7 shipped with PostgreSQL 9.6.17 and 10.12. -[Find out which versions of PostgreSQL (and other components) ship with -each Omnibus GitLab release](https://gitlab-org.gitlab.io/omnibus-gitlab/licenses.html). +[Find out which versions of PostgreSQL (and other components) ship with each Omnibus GitLab release](https://gitlab-org.gitlab.io/omnibus-gitlab/licenses.html). The lowest supported PostgreSQL versions are listed in the [installation requirements](../../install/requirements.md#postgresql-requirements). diff --git a/doc/administration/package_information/supported_os.md b/doc/administration/package_information/supported_os.md index 739ba80ea2b..7f79aa72a02 100644 --- a/doc/administration/package_information/supported_os.md +++ b/doc/administration/package_information/supported_os.md @@ -10,8 +10,8 @@ GitLab officially supports LTS versions of operating systems. While OSs like Ubuntu have a clear distinction between LTS and non-LTS versions, there are other OSs, openSUSE for example, that don't follow the LTS concept. Hence to avoid confusion, the official policy is that at any point of time, all the -operating systems supported by GitLab are listed in the [installation -page](https://about.gitlab.com/install/). +operating systems supported by GitLab are listed in the +[installation page](https://about.gitlab.com/install/). The following lists the currently supported OSs and their possible EOL dates. |