diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-24 14:45:56 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-24 14:45:56 +0000 |
| commit | 03e8491dbfcf0220f16eb4980ce9f67a9a439474 (patch) | |
| tree | 4582f8fe01c27549a00c2795d891c6c2313e584b | |
| parent | 02591b043052eb4f8041f8cf51546fab272d7b61 (diff) | |
| parent | d04e8f4fc09832473f7b3794d617aaba9cb204aa (diff) | |
| download | gitlab-ce-03e8491dbfcf0220f16eb4980ce9f67a9a439474.tar.gz | |
Merge branch 'patch-4' into 'master'
Update Ruby version to 2.3 in Requirements
According to the [GitLab 8.11 release notes](https://about.gitlab.com/2016/08/22/gitlab-8-11-released/), Ruby 2.3 is now supported and recommended. Update the documentation accordingly.
See merge request !5965
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | doc/install/requirements.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md index fee93d5f9c3..33d9407a0c1 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Instructions on how to start GitLab and how to run the tests can be found in the GitLab is a Ruby on Rails application that runs on the following software: - Ubuntu/Debian/CentOS/RHEL -- Ruby (MRI) 2.1 +- Ruby (MRI) 2.3 - Git 2.7.4+ - Redis 2.8+ - MySQL or PostgreSQL diff --git a/doc/install/requirements.md b/doc/install/requirements.md index a65ac8a5f79..571f1a38358 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -32,7 +32,7 @@ Please consider using a virtual machine to run GitLab. ## Ruby versions -GitLab requires Ruby (MRI) 2.1.x and currently does not work with versions 2.2 or 2.3. +GitLab requires Ruby (MRI) 2.3. Support for Ruby versions below 2.3 (2.1, 2.2) will stop with GitLab 8.13. You will have to use the standard MRI implementation of Ruby. We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/) but GitLab |