summaryrefslogtreecommitdiff
path: root/doc/update
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-20 18:08:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-20 18:08:44 +0000
commite0ab7eda1b1013e3246b0db28689b0749158f0bf (patch)
treec0b4fa77a0a781f0e0e868133293053ae75c2aff /doc/update
parent364f6f2e33e6f5eafe63b25d9256b88e72141b1c (diff)
downloadgitlab-ce-e0ab7eda1b1013e3246b0db28689b0749158f0bf.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/update')
-rw-r--r--doc/update/README.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/update/README.md b/doc/update/README.md
index f23716f3df8..510a8fb31fb 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -180,15 +180,14 @@ any downgrades would result to all sessions being invalidated and users are logg
In 12.0.0 we made various database related changes. These changes require that
users first upgrade to the latest 11.11 patch release. Once upgraded to 11.11.x,
-users can upgrade to 12.x. Failure to do so may result in database migrations
+users can upgrade to 12.0.x. Failure to do so may result in database migrations
not being applied, which could lead to application errors.
Example 1: you are currently using GitLab 11.11.3, which is the latest patch
-release for 11.11.x. You can upgrade as usual to 12.0.0, 12.1.0, etc.
+release for 11.11.x. You can upgrade as usual to 12.0.x.
Example 2: you are currently using a version of GitLab 10.x. To upgrade, first
-upgrade to 11.11.3. Once upgraded to 11.11.3 you can safely upgrade to 12.0.0
-or future versions.
+upgrade to 11.11.3. Once upgraded to 11.11.3 you can safely upgrade to 12.0.x.
## Miscellaneous