diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-10 14:52:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-10 14:52:44 +0000 |
commit | 86a8eee1b8bd43a1fe962905eb97a1f478cc050b (patch) | |
tree | 439816bbaf4a0caf16d579223eb9465e0b0daebc /doc/update | |
parent | 1b517a5a19c4aafc6fa6d738b0ee7c1e4a2cce36 (diff) | |
download | gitlab-ce-86a8eee1b8bd43a1fe962905eb97a1f478cc050b.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-ee
Diffstat (limited to 'doc/update')
-rw-r--r-- | doc/update/README.md | 2 | ||||
-rw-r--r-- | doc/update/upgrading_from_source.md | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/doc/update/README.md b/doc/update/README.md index 774d468cb76..0534d793613 100644 --- a/doc/update/README.md +++ b/doc/update/README.md @@ -312,6 +312,8 @@ installation-specific upgrade instructions, based on how you installed GitLab: ### 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.3.0 diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md index d2a3466984e..4eedc9bb89f 100644 --- a/doc/update/upgrading_from_source.md +++ b/doc/update/upgrading_from_source.md @@ -61,8 +61,8 @@ sudo service gitlab stop ### 3. Update Ruby -NOTE: Beginning in GitLab 12.2, we only support Ruby 2.6 or higher, and dropped -support for Ruby 2.5. Be sure to upgrade if necessary. +NOTE: Beginning in GitLab 13.6, we only support Ruby 2.7 or higher, and dropped +support for Ruby 2.6. Be sure to upgrade if necessary. You can check which version you are running with `ruby -v`. @@ -70,21 +70,15 @@ Download Ruby and compile it: ```shell mkdir /tmp/ruby && cd /tmp/ruby -curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.6.tar.gz -echo '2d78048e293817f38d4ede4ebc7873013e97bb0b ruby-2.6.6.tar.gz' | shasum -c - && tar xzf ruby-2.6.6.tar.gz -cd ruby-2.6.6 +curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.2.tar.gz +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 make sudo make install ``` -Install Bundler: - -```shell -sudo gem install bundler --no-document --version '< 2' -``` - ### 4. Update Node.js NOTE: To check the minimum required Node.js version, see [Node.js versions](../install/requirements.md#nodejs-versions). |