Commit ea432f60326752a169d89cee9133280d7d513e65

Authored by Dmitriy Zaporozhets
2 parents 0142aa5a 322a8f1d

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

1 v 6.7.0 1 v 6.7.0
  2 + - Increased the example Nginx client_max_body_size from 5MB to 20MB, consider updating it manually on existing installations
2 - Add support for Gemnasium as a Project Service (Olivier Gonzalez) 3 - Add support for Gemnasium as a Project Service (Olivier Gonzalez)
3 - Add edit file button to MergeRequest diff 4 - Add edit file button to MergeRequest diff
4 - Public groups (Jason Hollingsworth) 5 - Public groups (Jason Hollingsworth)
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 35
36 ### Requirements 36 ### Requirements
37 37
38 -* Ubuntu/Debian** 38 +* Ubuntu/Debian/CentOS/RHEL**
39 * ruby 1.9.3+ 39 * ruby 1.9.3+
40 * git 1.7.10+ 40 * git 1.7.10+
41 * redis 2.0+ 41 * redis 2.0+
doc/install/requirements.md
@@ -2,26 +2,24 @@ @@ -2,26 +2,24 @@
2 2
3 GitLab is developed for the Linux operating system. For the installations options and instructions please see [the installation section of the readme](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md#installation). 3 GitLab is developed for the Linux operating system. For the installations options and instructions please see [the installation section of the readme](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md#installation).
4 4
5 -## GitLab officially supports 5 +## Supported Linux distributions
6 6
7 -- Ubuntu Linux  
8 -- Debian/GNU Linux  
9 -  
10 -## GitLab.com offers paid support for  
11 -  
12 -- Red Hat Enterprise Linux (RHEL) 7 +- Ubuntu
  8 +- Debian
13 - CentOS 9 - CentOS
  10 +- RedHat Enterprise Linux
  11 +- Scientific Linux
14 - Oracle Linux 12 - Oracle Linux
15 13
16 -## Not officially supported are 14 +## Unsupported Linux distributions
17 15
18 - Arch Linux 16 - Arch Linux
19 - Fedora 17 - Fedora
20 - Gentoo 18 - Gentoo
21 19
22 -But on the above distributions it is pretty easy to install GitLab yourself. 20 +But on the above unsupported distributions is stll possible to install GitLab yourself with the [manual installation guide](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md).
23 21
24 -## Unsupported Unix Systems 22 +## Unsupported Unix operating systems
25 23
26 There is nothing that prevents GitLab from running on other Unix operating systems. 24 There is nothing that prevents GitLab from running on other Unix operating systems.
27 This means you may get it to work on systems running FreeBSD or OS X. 25 This means you may get it to work on systems running FreeBSD or OS X.
lib/support/nginx/gitlab
@@ -27,7 +27,7 @@ server { @@ -27,7 +27,7 @@ server {
27 27
28 # Increase this if you want to upload large attachments 28 # Increase this if you want to upload large attachments
29 # Or if you want to accept large git objects over http 29 # Or if you want to accept large git objects over http
30 - client_max_body_size 5m; 30 + client_max_body_size 20m;
31 31
32 # individual nginx logs for this gitlab vhost 32 # individual nginx logs for this gitlab vhost
33 access_log /var/log/nginx/gitlab_access.log; 33 access_log /var/log/nginx/gitlab_access.log;