summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-08-12 22:55:11 +0000
committerThong Kuah <tkuah@gitlab.com>2019-08-12 22:55:11 +0000
commit2de17d12d6d8daf1296526ca0b594cf61f808339 (patch)
treea0cb5f5712ca5c6d070e4ac238feff864da8b6b0 /doc
parent4254f5dc0ea4c226690d0d9abd20d1c9822fefcb (diff)
parentd470f429fb84fc02a7105de99225a93c5345b3f2 (diff)
downloadgitlab-ce-2de17d12d6d8daf1296526ca0b594cf61f808339.tar.gz
Merge branch '63942-remove-config-action_dispatch-use_authenticated_cookie_encryption-configuration' into 'master'
Remove `config.action_dispatch.use_authenticated_cookie_encryption` configuration Closes #63942 See merge request gitlab-org/gitlab-ce!31463
Diffstat (limited to 'doc')
-rw-r--r--doc/update/README.md24
-rw-r--r--doc/update/upgrading_from_source.md14
2 files changed, 24 insertions, 14 deletions
diff --git a/doc/update/README.md b/doc/update/README.md
index 974982da5d0..42c43110a19 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -135,6 +135,30 @@ If you need to downgrade your Enterprise Edition installation back to Community
Edition, you can follow [this guide][ee-ce] to make the process as smooth as
possible.
+## Version specific upgrading instructions
+
+### 12.2.0
+
+In 12.2.0, we enabled Rails' authenticated cookie encryption. Old sessions are
+automatically upgraded.
+
+However, session cookie downgrades are not supported. So after upgrading to 12.2.0,
+any downgrades would result to all sessions being invalidated and users are logged out.
+
+### 12.0.0
+
+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
+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.
+
+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.
+
## Miscellaneous
- [MySQL to PostgreSQL](mysql_to_postgresql.md) guides you through migrating
diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md
index d3b0a3c2829..0aef40262c9 100644
--- a/doc/update/upgrading_from_source.md
+++ b/doc/update/upgrading_from_source.md
@@ -378,20 +378,6 @@ Example:
Additional instructions here.
-->
-### 12.0.0
-
-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
-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.
-
-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.
-
## Things went south? Revert to previous version
### 1. Revert the code to the previous version