diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-27 12:44:14 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-27 12:44:14 +0000 |
| commit | c3ae30b60edd40f30c10e69532ecf8833cd0440f (patch) | |
| tree | 42bc7018d10eba2cb8e16217836c7ba542ec3ad9 | |
| parent | 7fc44a27a485e3348c0c021537253af0e35a8d49 (diff) | |
| parent | 4fc17cf13f955e9deedcfba81009dd658c4779a9 (diff) | |
| download | gitlab-ce-c3ae30b60edd40f30c10e69532ecf8833cd0440f.tar.gz | |
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
| -rw-r--r-- | config/gitlab.yml.example | 3 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c63e8cb7ded..be9ca8dc8c1 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -202,7 +202,8 @@ production: &base # Use the default values unless you really know what you are doing git: bin_path: /usr/bin/git - # Max size of a git object (e.g. a commit), in bytes + # The next value is the maximum memory size grit can use + # Given in number of bytes per git object (e.g. a commit) # This value can be increased if you have very large commits max_size: 5242880 # 5.megabytes # Git timeout to read a commit, in seconds diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index 764c34dc691..0860d2a8693 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -25,7 +25,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 + # 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 |