summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordosire <sytses@gmail.com>2014-01-22 17:01:47 +0100
committerdosire <sytses@gmail.com>2014-01-22 17:01:47 +0100
commit119c782e0b9f691a3eeff1f44c23522aa4f9c552 (patch)
tree10289c57b5e02e31a1e86dba6ac701a10764b252
parentdcc6ff5bcdf760e73fb2a045521716d0997fdbab (diff)
downloadgitlab-ce-119c782e0b9f691a3eeff1f44c23522aa4f9c552.tar.gz
More explanation for upload limits.
-rw-r--r--config/gitlab.yml.example1
-rw-r--r--lib/support/nginx/gitlab1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index c63e8cb7ded..c4769938d18 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -204,6 +204,7 @@ production: &base
bin_path: /usr/bin/git
# Max size of a git object (e.g. a commit), in bytes
# This value can be increased if you have very large commits
+ # Please also change the limit for your webserver (for Nginx see lib/support/nginx/gitlab)
max_size: 5242880 # 5.megabytes
# Git timeout to read a commit, in seconds
timeout: 10
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index d1d959e152e..99691fe94a5 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -13,6 +13,7 @@ server {
root /home/git/gitlab/public;
# Set value of client_max_body_size to at least the value of git.max_size in gitlab.yml
+ # Also increase this if you want to upload large attachments
client_max_body_size 5m;
# individual nginx logs for this gitlab vhost