Commit 9bd1afd7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ruby2.1' into 'master'

Ruby2.1

Fixed #1075
parents 868629dc 4ed39a77
No related merge requests found
...@@ -18,6 +18,7 @@ v 7.0.0 ...@@ -18,6 +18,7 @@ v 7.0.0
- Case-insensetive search for issues - Case-insensetive search for issues
- Update to rails 4.1 - Update to rails 4.1
- Improve performance of application for projects and groups with a lot of members - Improve performance of application for projects and groups with a lot of members
- Formally support Ruby 2.1
v 6.9.2 v 6.9.2
- Revert the commit that broke the LDAP user filter - Revert the commit that broke the LDAP user filter
......
...@@ -39,7 +39,7 @@ Please consider using a virtual machine to run GitLab. ...@@ -39,7 +39,7 @@ Please consider using a virtual machine to run GitLab.
## Ruby versions ## Ruby versions
GitLab requires Ruby (MRI) 2.0+. GitLab requires Ruby (MRI) 2.0 or 2.1
>>>>>>> Update docs to markdown style guide. >>>>>>> Update docs to markdown style guide.
You will have to use the standard MRI implementation of Ruby. You will have to use the standard MRI implementation of Ruby.
...@@ -60,8 +60,8 @@ We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab ...@@ -60,8 +60,8 @@ We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab
### Memory ### Memory
- 512MB is the absolute minimum, you need 256MB of swap, you can configure only one slow unicorn worker, only ssh access will work, we do not recommend this - 512MB is the absolute minimum but we do not recommend this amount of memory, you'll need to configure a minimum swap of 256MB, you're memory will only allow you to run one slow unicorn worker, things will case only git ssh access to work because the git http access requires two running workers (one to receive the user request and one for the authorization check),
- 1GB supports up to 100 users (with individual repositories under 250MB, otherwise git memory usage necessitates using swap space) - 1GB supports up to 100 users (with individual repositories under 250MB, otherwise git memory usage necessitates configuring swap space)
- **2GB** is the **recommended** memory size and supports up to 500 users - **2GB** is the **recommended** memory size and supports up to 500 users
- 4GB supports up to 2,000 users - 4GB supports up to 2,000 users
- 8GB supports up to 5,000 users - 8GB supports up to 5,000 users
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment