summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-08-23 09:19:09 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-08-23 09:19:09 +0000
commit76ffbcc8043e94343129e2211b519f1210e75dd9 (patch)
tree6296ae6338f84310b18d9f821b4dacd73b4017cc
parentd4502d75d54620caeaee706603c271c45f1daaf8 (diff)
parentdbbcdfb5beaa735e020d6dbd8516665ae846f01a (diff)
downloadgitlab-ce-76ffbcc8043e94343129e2211b519f1210e75dd9.tar.gz
Merge branch 'v12-upgrade-recommendation-docs' into 'master'
Add version 12 upgrade recommendations Closes #63907 See merge request gitlab-org/gitlab-ce!30201
-rw-r--r--doc/policy/maintenance.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/policy/maintenance.md b/doc/policy/maintenance.md
index 018c273c51a..f7ba7c16a9e 100644
--- a/doc/policy/maintenance.md
+++ b/doc/policy/maintenance.md
@@ -86,6 +86,7 @@ Please see the table below for some examples:
| 9.4.5 | 8.13.4 | `8.13.4` -> `8.17.7` -> `9.4.5` | `8.17.7` is the last version in version `8` |
| 10.1.4 | 8.13.4 | `8.13.4 -> 8.17.7 -> 9.5.10 -> 10.1.4` | `8.17.7` is the last version in version `8`, `9.5.10` is the last version in version `9` |
| 11.3.4 | 8.13.4 | `8.13.4` -> `8.17.7` -> `9.5.10` -> `10.8.7` -> `11.3.4` | `8.17.7` is the last version in version `8`, `9.5.10` is the last version in version `9`, `10.8.7` is the last version in version `10` |
+| 12.0.2 | 11.3.4 | `11.3.4` -> `11.11.x` -> `12.0.2` | `11.11.x` is the last version in version `11`
More information about the release procedures can be found in our
[release documentation](https://gitlab.com/gitlab-org/release/docs). You may also want to read our