diff options
Diffstat (limited to 'doc/update')
| -rw-r--r-- | doc/update/index.md | 17 | ||||
| -rw-r--r-- | doc/update/patch_versions.md | 9 | ||||
| -rw-r--r-- | doc/update/restore_after_failure.md | 5 | ||||
| -rw-r--r-- | doc/update/upgrading_from_ce_to_ee.md | 9 | ||||
| -rw-r--r-- | doc/update/upgrading_from_source.md | 8 |
5 files changed, 33 insertions, 15 deletions
diff --git a/doc/update/index.md b/doc/update/index.md index 5c26ddb7ec6..71d1bd06ff0 100644 --- a/doc/update/index.md +++ b/doc/update/index.md @@ -4,7 +4,7 @@ group: Distribution info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments --- -# Upgrading GitLab +# Upgrading GitLab **(FREE SELF)** Upgrading GitLab is a relatively straightforward process, but the complexity can increase based on the installation method you have used, how old your @@ -177,14 +177,14 @@ Find where your version sits in the upgrade path below, and upgrade GitLab accordingly, while also consulting the [version-specific upgrade instructions](#version-specific-upgrading-instructions): -`8.11.Z` -> `8.12.0` -> `8.17.7` -> `9.5.10` -> `10.8.7` -> `11.11.8` -> `12.0.12` -> `12.1.17` -> `12.10.14` -> `13.0.14` -> `13.1.11` - > [latest `13.Y.Z`](https://about.gitlab.com/releases/categories/releases/) +`8.11.Z` -> `8.12.0` -> `8.17.7` -> `9.5.10` -> `10.8.7` -> `11.11.8` -> `12.0.12` -> `12.1.17` -> `12.10.14` -> `13.0.14` -> `13.1.11` -> [latest `13.Y.Z`](https://about.gitlab.com/releases/categories/releases/) The following table, while not exhaustive, shows some examples of the supported upgrade paths. | Target version | Your version | Supported upgrade path | Note | | --------------------- | ------------ | ------------------------ | ---- | -| `13.4.3` | `12.9.2` | `12.9.2` -> `12.10.14` -> `13.0.14` -> `13.4.3` | Two intermediate versions are required: the final `12.10` release, plus `13.0`. | +| `13.5.4` | `12.9.2` | `12.9.2` -> `12.10.14` -> `13.0.14` -> `13.1.11` -> `13.5.4` | Three intermediate versions are required: the final `12.10` release, plus `13.0` and `13.1`. | | `13.2.10` | `11.5.0` | `11.5.0` -> `11.11.8` -> `12.0.12` -> `12.1.17` -> `12.10.14` -> `13.0.14` -> `13.2.10` | Five intermediate versions are required: the final `11.11`, `12.0`, `12.1` and `12.10` releases, plus `13.0`. | | `12.10.14` | `11.3.4` | `11.3.4` -> `11.11.8` -> `12.0.12` -> `12.1.17` -> `12.10.14` | Three intermediate versions are required: the final `11.11` and `12.0` releases, plus `12.1` | | `12.9.5` | `10.4.5` | `10.4.5` -> `10.8.7` -> `11.11.8` -> `12.0.12` -> `12.1.17` -> `12.9.5` | Four intermediate versions are required: `10.8`, `11.11`, `12.0` and `12.1`, then `12.9.5` | @@ -352,12 +352,21 @@ NOTE: Specific information that follow related to Ruby and Git versions do not apply to [Omnibus installations](https://docs.gitlab.com/omnibus/) and [Helm Chart deployments](https://docs.gitlab.com/charts/). They come with appropriate Ruby and Git versions and are not using system binaries for Ruby and Git. There is no need to install Ruby or Git when utilizing these two approaches. +### 13.11.0 + +Git 2.31.x and later is required. We recommend you use the +[Git version provided by Gitaly](../install/installation.md#git). + ### 13.6.0 Ruby 2.7.2 is required. GitLab will not start with Ruby 2.6.6 or older versions. The required Git version is Git v2.29 or higher. +### 13.4.0 + +GitLab 13.4.0 includes a background migration to [move all remaining repositories in legacy storage to hashed storage](../administration/raketasks/storage.md#migrate-to-hashed-storage). There are [known issues with this migration](https://gitlab.com/gitlab-org/gitlab/-/issues/259605) which are fixed in GitLab 13.5.4 and later. If possible, skip 13.4.0 and upgrade to 13.5.4 or higher instead. Note that the migration can take quite a while to run, depending on how many repositories must be moved. Be sure to check that all background migrations have completed before upgrading further. + ### 13.3.0 The recommended Git version is Git v2.28. The minimum required version of Git @@ -401,7 +410,7 @@ fail for [multi-node GitLab installations](https://docs.gitlab.com/omnibus/updat So, if you are using multiple Rails servers and specifically upgrading from 13.0, all servers must first be upgraded to 13.1.Z before upgrading to 13.2.0 or later: -1. Ensure all GitLab web nodes are on GitLab 13.1.Z. +1. Ensure all GitLab web nodes are running GitLab 13.1.Z. 1. Optionally, enable the `global_csrf_token` feature flag to enable new method of CSRF token generation: diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md index b4c80c4f877..ce0ba46b518 100644 --- a/doc/update/patch_versions.md +++ b/doc/update/patch_versions.md @@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w comments: false --- -# Universal update guide for patch versions of source installations +# Universal update guide for patch versions of source installations **(FREE SELF)** ## Select Version to Install @@ -43,7 +43,12 @@ sudo -u git -H git checkout LATEST_TAG -b LATEST_TAG ```shell cd /home/git/gitlab -sudo -u git -H bundle install --without development test mysql --deployment +# If you haven't done so during installation or a previous upgrade already +sudo -u git -H bundle config set --local deployment 'true' +sudo -u git -H bundle config set --local without 'development test mysql aws kerberos' + +# Update gems +sudo -u git -H bundle install # Optional: clean up old gems sudo -u git -H bundle clean diff --git a/doc/update/restore_after_failure.md b/doc/update/restore_after_failure.md index 64e92c802f2..0847fc82f19 100644 --- a/doc/update/restore_after_failure.md +++ b/doc/update/restore_after_failure.md @@ -4,7 +4,7 @@ group: Distribution info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments --- -# Restoring from backup after a failed upgrade +# Restoring from backup after a failed upgrade **(FREE SELF)** Upgrades are usually smooth and restoring from backup is a rare occurrence. However, it's important to know how to recover when problems do arise. @@ -12,7 +12,8 @@ However, it's important to know how to recover when problems do arise. ## Roll back to an earlier version and restore a backup In some cases after a failed upgrade, the fastest solution is to roll back to -the previous version you were using. +the previous version you were using. We recommend this path because the failed +upgrade will likely have made database changes that can not be readily reverted. First, roll back the code or package. For source installations this involves checking out the older version (branch or tag). For Omnibus installations this diff --git a/doc/update/upgrading_from_ce_to_ee.md b/doc/update/upgrading_from_ce_to_ee.md index 71fd4efb16d..50d169917ba 100644 --- a/doc/update/upgrading_from_ce_to_ee.md +++ b/doc/update/upgrading_from_ce_to_ee.md @@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w comments: false --- -# Upgrading from Community Edition to Enterprise Edition from source +# Upgrading from Community Edition to Enterprise Edition from source **(FREE SELF)** NOTE: In the past we used separate documents for upgrading from @@ -63,8 +63,11 @@ sudo -u git -H git checkout EE_BRANCH ```shell cd /home/git/gitlab -sudo -u git -H bundle config set deployment 'true' -sudo -u git -H bundle config set without 'development test mysql aws kerberos' +# If you haven't done so during installation or a previous upgrade already +sudo -u git -H bundle config set --local deployment 'true' +sudo -u git -H bundle config set --local without 'development test mysql aws kerberos' + +# Update gems sudo -u git -H bundle install # Optional: clean up old gems diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md index 42acb7552e4..33ae9befd16 100644 --- a/doc/update/upgrading_from_source.md +++ b/doc/update/upgrading_from_source.md @@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w comments: false --- -# Upgrading Community Edition and Enterprise Edition from source +# Upgrading Community Edition and Enterprise Edition from source **(FREE SELF)** NOTE: Users wishing to upgrade to 12.0.0 must take some extra steps. See the @@ -75,7 +75,7 @@ curl --remote-name --progress "https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7 echo 'cb9731a17487e0ad84037490a6baf8bfa31a09e8 ruby-2.7.2.tar.gz' | shasum -c - && tar xzf ruby-2.7.2.tar.gz cd ruby-2.7.2 -./configure --disable-install-rdoc +./configure --disable-install-rdoc --enable-shared make sudo make install ``` @@ -269,8 +269,8 @@ sudo systemctl daemon-reload cd /home/git/gitlab # If you haven't done so during installation or a previous upgrade already -sudo -u git -H bundle config set deployment 'true' -sudo -u git -H bundle config set without 'development test mysql aws kerberos' +sudo -u git -H bundle config set --local deployment 'true' +sudo -u git -H bundle config set --local without 'development test mysql aws kerberos' # Update gems sudo -u git -H bundle install |