Download as
Browse Code »

Commit 9bd1afd7219d18771aef7d26415d85453629fcc0

Authored by Dmitriy Zaporozhets
2 parents 868629dc 4ed39a77
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'ruby2.1' into 'master' 

Ruby2.1

Fixed #1075
Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
@@ -18,6 +18,7 @@ v 7.0.0 @@ -18,6 +18,7 @@ v 7.0.0
18 - Case-insensetive search for issues 18 - Case-insensetive search for issues
19 - Update to rails 4.1 19 - Update to rails 4.1
20 - Improve performance of application for projects and groups with a lot of members 20 - Improve performance of application for projects and groups with a lot of members
  21 + - Formally support Ruby 2.1
21 22
22 v 6.9.2 23 v 6.9.2
23 - Revert the commit that broke the LDAP user filter 24 - Revert the commit that broke the LDAP user filter
doc/install/requirements.md
  Diff comments   View file @9bd1afd
@@ -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.
39 39
40 ## Ruby versions 40 ## Ruby versions
41 41
42 -GitLab requires Ruby (MRI) 2.0+. 42 +GitLab requires Ruby (MRI) 2.0 or 2.1
43 43
44 >>>>>>> Update docs to markdown style guide. 44 >>>>>>> Update docs to markdown style guide.
45 You will have to use the standard MRI implementation of Ruby. 45 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
60 60
61 ### Memory 61 ### Memory
62 62
63 -- 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  
64 -- 1GB supports up to 100 users (with individual repositories under 250MB, otherwise git memory usage necessitates using swap space) 63 +- 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),
  64 +- 1GB supports up to 100 users (with individual repositories under 250MB, otherwise git memory usage necessitates configuring swap space)
65 - **2GB** is the **recommended** memory size and supports up to 500 users 65 - **2GB** is the **recommended** memory size and supports up to 500 users
66 - 4GB supports up to 2,000 users 66 - 4GB supports up to 2,000 users
67 - 8GB supports up to 5,000 users 67 - 8GB supports up to 5,000 users