diff options
| author | dosire <sytses@gmail.com> | 2014-01-22 17:51:00 +0100 |
|---|---|---|
| committer | dosire <sytses@gmail.com> | 2014-01-22 17:51:00 +0100 |
| commit | 7ad70a56d3258687b5e129b15dbfca4edb199eb4 (patch) | |
| tree | 70bb543f454d9c72928c4545c3c86825ff8ac27b | |
| parent | 119c782e0b9f691a3eeff1f44c23522aa4f9c552 (diff) | |
| download | gitlab-ce-7ad70a56d3258687b5e129b15dbfca4edb199eb4.tar.gz | |
Git over ssh and http are different things.
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c4769938d18..67adbfb9a4c 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -203,8 +203,8 @@ production: &base git: 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) + # This value can be increased if you have very large commits with git over ssh + # Git over http is limited by 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 99691fe94a5..ee78d78369f 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -12,8 +12,8 @@ server { server_tokens off; # don't show the version number, a security best practice 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 + # 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; # individual nginx logs for this gitlab vhost |