summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--README.md2
-rw-r--r--doc/install/requirements.md18
-rw-r--r--lib/support/nginx/gitlab2
4 files changed, 11 insertions, 12 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 913dbab57cc..c8bbce73f5a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
v 6.7.0
+ - Increased the example Nginx client_max_body_size from 5MB to 20MB, consider updating it manually on existing installations
- Add support for Gemnasium as a Project Service (Olivier Gonzalez)
- Add edit file button to MergeRequest diff
- Public groups (Jason Hollingsworth)
diff --git a/README.md b/README.md
index b14db7d0af5..3bffdbe1f3a 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@
### Requirements
-* Ubuntu/Debian**
+* Ubuntu/Debian/CentOS/RHEL**
* ruby 1.9.3+
* git 1.7.10+
* redis 2.0+
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index ea172733b11..56a2a5efeb0 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -2,26 +2,24 @@
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).
-## GitLab officially supports
+## Supported Linux distributions
-- Ubuntu Linux
-- Debian/GNU Linux
-
-## GitLab.com offers paid support for
-
-- Red Hat Enterprise Linux (RHEL)
+- Ubuntu
+- Debian
- CentOS
+- RedHat Enterprise Linux
+- Scientific Linux
- Oracle Linux
-## Not officially supported are
+## Unsupported Linux distributions
- Arch Linux
- Fedora
- Gentoo
-But on the above distributions it is pretty easy to install GitLab yourself.
+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).
-## Unsupported Unix Systems
+## Unsupported Unix operating systems
There is nothing that prevents GitLab from running on other Unix operating systems.
This means you may get it to work on systems running FreeBSD or OS X.
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index 882f0386046..7a0f3efbb53 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -27,7 +27,7 @@ server {
# Increase this if you want to upload large attachments
# Or if you want to accept large git objects over http
- client_max_body_size 5m;
+ client_max_body_size 20m;
# individual nginx logs for this gitlab vhost
access_log /var/log/nginx/gitlab_access.log;