diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-06-19 11:57:48 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-06-19 11:57:48 +0000 |
| commit | 5740dccd126423b9277818fced559884ef9fed4d (patch) | |
| tree | 811e1f1a60606112422bb2d28302f8d6cbbc21c8 | |
| parent | 5de45557988ed61c753c37df5f535fceb8f6bb1a (diff) | |
| parent | 91510305e61b21c0cecc1c24459f21b98c80cc90 (diff) | |
| download | gitlab-ce-5740dccd126423b9277818fced559884ef9fed4d.tar.gz | |
Merge branch 'docs/12-0-upgrade-correction' into 'master'
Docs: Correct upgrade guides for 12.0
See merge request gitlab-org/gitlab-ce!29846
| -rw-r--r-- | doc/update/upgrading_from_source.md | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md index 5e18769f0f1..a05af7350de 100644 --- a/doc/update/upgrading_from_source.md +++ b/doc/update/upgrading_from_source.md @@ -412,18 +412,15 @@ Additional instructions here. 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.0.x. You **can not** upgrade from 11.11.x to 12.1.0 or a -newer version, instead you **must** first upgrade to 12.0.0. Failure to do so -may result in database migrations not being applied, which could lead to -application errors. +users can upgrade to 12.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. To upgrade, first upgrade to 12.0.0, then upgrade to any -future versions. +release for 11.11.x. You can upgrade as usual to 12.0.0, 12.1.0, etc. 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, -then upgrade to any future versions. +upgrade to 11.11.3. Once upgraded to 11.11.3 you can safely upgrade to 12.0.0 +or future versions. ## Things went south? Revert to previous version |