diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-05 09:21:03 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-05 09:21:03 +0000 |
| commit | 46a84d801374f212055440c435a0a0199ed66968 (patch) | |
| tree | fa09c1690fe2474f716622ec44bc081eab229e68 | |
| parent | 734f97ae1172d07a1715d100c71791e22a2e810f (diff) | |
| parent | f9d71c4b911284bcb9577c23b8a2a5f61a9ffd71 (diff) | |
| download | gitlab-ce-46a84d801374f212055440c435a0a0199ed66968.tar.gz | |
Merge branch 'rs-issue-2135' into 'master'
Update docs for Ruby MRI 2.1 requirement
Addresses #2135
See merge request !1089
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | doc/install/requirements.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md index 14dc52d30ba..52e12bb66ad 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.0 or 2.1 +- Ruby (MRI) 2.1 - Git 1.7.10+ - Redis 2.0+ - MySQL or PostgreSQL diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 1efc1f7bddf..605977097b4 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.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. @@ -113,4 +113,4 @@ On a very active server (10,000 active users) the Sidekiq process can use 1GB+ o ### Common UI problems with IE -If you experience UI issues with Internet Explorer, please make sure that you have the `Compatibility View` mode disabled.
\ No newline at end of file +If you experience UI issues with Internet Explorer, please make sure that you have the `Compatibility View` mode disabled. |