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/install | |
| parent | 1b517a5a19c4aafc6fa6d738b0ee7c1e4a2cce36 (diff) | |
| download | gitlab-ce-86a8eee1b8bd43a1fe962905eb97a1f478cc050b.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-6-stable-ee
Diffstat (limited to 'doc/install')
| -rw-r--r-- | doc/install/installation.md | 6 | ||||
| -rw-r--r-- | doc/install/requirements.md | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 87e3cd1ea06..a6d00ad140e 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -224,12 +224,6 @@ make sudo make install ``` -Then install the Bundler gem (a version below 2.x): - -```shell -sudo gem install bundler --no-document --version '< 2' -``` - ## 3. Go In GitLab 8.0 and later, GitLab has several daemons written in Go. To install diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 4a61831ff86..3f02544a5ab 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -45,7 +45,13 @@ Please consider using a virtual machine to run GitLab. ### Ruby versions -GitLab requires Ruby (MRI) 2.6. Beginning in GitLab 12.2, we no longer support Ruby 2.5 and lower. +From GitLab 13.6: + +- Ruby 2.7 and later is required. + +From GitLab 12.2: + +- Ruby 2.6 and later is required. You must use the standard MRI implementation of Ruby. We love [JRuby](https://www.jruby.org/) and [Rubinius](https://github.com/rubinius/rubinius#the-rubinius-language-platform), but GitLab |