Skip to content
Snippets Groups Projects
Commit ab328968 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'rs-pick-ruby-2-1' into '7-13-stable'

Update docs for Ruby MRI 2.1 requirement

Updates `7-13-stable` with changes from !1089

Closes #2135

See merge request !1109
parents 92af4020 4d8a9ae8
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -44,7 +44,7 @@ On [about.gitlab.com](https://about.gitlab.com/) you can find more information a
GitLab requires 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
Loading
Loading
@@ -96,4 +96,4 @@ Please see [Getting help for GitLab](https://about.gitlab.com/getting-help/) on
## Is it awesome?
 
Thanks for [asking this question](https://twitter.com/supersloth/status/489462789384056832) Joshua.
[These people](https://twitter.com/gitlab/favorites) seem to like it.
\ No newline at end of file
[These people](https://twitter.com/gitlab/favorites) seem to like it.
Loading
Loading
@@ -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.
 
Loading
Loading
@@ -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.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment