Merge branch 'rs-issue-2135' into 'master'

Update docs for Ruby MRI 2.1 requirement

Addresses #2135 

See merge request !1089
This commit is contained in:
Dmitriy Zaporozhets 2015-08-05 09:21:03 +00:00
commit 46a84d8013
2 changed files with 3 additions and 3 deletions

View file

@ -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.0 or 2.1
- Ruby (MRI) 2.1
- Git 1.7.10+
- Redis 2.0+
- MySQL or PostgreSQL

View file

@ -32,7 +32,7 @@ Please consider using a virtual machine to run GitLab.
## Ruby versions
GitLab requires Ruby (MRI) 2.0 or 2.1
GitLab requires Ruby (MRI) 2.1
You will have to use the standard MRI implementation of Ruby.
We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/) but GitLab needs several Gems that have native extensions.