diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-11-16 17:05:47 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-11-16 17:05:47 +0200 |
| commit | c67bafca31362c6a9d99b071d4558711d6f03b15 (patch) | |
| tree | 96ea00cb681e9f6c474761ec4b699c07100d87e2 /lib/support/nginx/gitlab-ssl | |
| parent | f194f56538ab5da5cc4dd9f89d5784877a5c4bd9 (diff) | |
| parent | 9a3df9d5d015db292f9f50770158fdc3fdc4a6ca (diff) | |
| download | gitlab-ce-ce-to-ee.tar.gz | |
Merge remote-tracking branch 'origin/master' into ce-to-eece-to-ee
Diffstat (limited to 'lib/support/nginx/gitlab-ssl')
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index b463d5b6aa9..90749947fa4 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -48,7 +48,7 @@ upstream gitlab-workhorse { ## Redirects all HTTP traffic to the HTTPS host server { - ## Either remove "default_server" from the listen line below, + ## Either remove "default_server" from the listen line below, ## or delete the /etc/nginx/sites-enabled/default file. This will cause gitlab ## to be served if you visit any address that your server responds to, eg. ## the ip address of the server (http://x.x.x.x/) @@ -160,6 +160,13 @@ server { proxy_pass http://gitlab; } + location ~ ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects { + client_max_body_size 0; + # 'Error' 418 is a hack to re-use the @gitlab-workhorse block + error_page 418 = @gitlab-workhorse; + return 418; + } + location ~ ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$ { # 'Error' 418 is a hack to re-use the @gitlab-workhorse block error_page 418 = @gitlab-workhorse; |