diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-06-05 08:45:12 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-06-05 08:45:12 +0200 |
| commit | 4ed39a77ef79178b231f3fb309b41df1fd8cc2df (patch) | |
| tree | c576280d841d9f78565c5858b5b4a7e26d2189c8 | |
| parent | 248a3e5688b7576995d21f1fb47c3deb2ae4de08 (diff) | |
| download | gitlab-ce-4ed39a77ef79178b231f3fb309b41df1fd8cc2df.tar.gz | |
Support Ruby 2.1 and better explain the memory requirements.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | doc/install/requirements.md | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 760218690b0..f825c7f68f9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,7 @@ v 7.0.0 - Case-insensetive search for issues - Update to rails 4.1 - Improve performance of application for projects and groups with a lot of members + - Formally support Ruby 2.1 v 6.9.2 - Revert the commit that broke the LDAP user filter diff --git a/doc/install/requirements.md b/doc/install/requirements.md index cec35ca7be7..575df915a20 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -39,7 +39,7 @@ Please consider using a virtual machine to run GitLab. ## Ruby versions -GitLab requires Ruby (MRI) 2.0+. +GitLab requires Ruby (MRI) 2.0 or 2.1 >>>>>>> Update docs to markdown style guide. 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 ### 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 -- 1GB supports up to 100 users (with individual repositories under 250MB, otherwise git memory usage necessitates using swap space) +- 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 configuring swap space) - **2GB** is the **recommended** memory size and supports up to 500 users - 4GB supports up to 2,000 users - 8GB supports up to 5,000 users |