Commit c3ae30b60edd40f30c10e69532ecf8833cd0440f

Authored by Dmitriy Zaporozhets
2 parents 7fc44a27 4fc17cf1

Merge branch 'upload-limits' into 'master'

Upload Limits

Better documentation for the upload limit. Please have a hard time when they need to change the upload limits, see https://gitlab.com/gitlab-org/gitlab-ce/issues/5
config/gitlab.yml.example
... ... @@ -202,7 +202,8 @@ production: &base
202 202 # Use the default values unless you really know what you are doing
203 203 git:
204 204 bin_path: /usr/bin/git
205   - # Max size of a git object (e.g. a commit), in bytes
  205 + # The next value is the maximum memory size grit can use
  206 + # Given in number of bytes per git object (e.g. a commit)
206 207 # This value can be increased if you have very large commits
207 208 max_size: 5242880 # 5.megabytes
208 209 # Git timeout to read a commit, in seconds
... ...
lib/support/nginx/gitlab
... ... @@ -25,7 +25,8 @@ server {
25 25 server_tokens off; # don't show the version number, a security best practice
26 26 root /home/git/gitlab/public;
27 27  
28   - # Set value of client_max_body_size to at least the value of git.max_size in gitlab.yml
  28 + # Increase this if you want to upload large attachments
  29 + # Or if you want to accept large git objects over http
29 30 client_max_body_size 5m;
30 31  
31 32 # individual nginx logs for this gitlab vhost
... ...