summaryrefslogtreecommitdiff
path: root/lib/support
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-11-19 14:41:44 +0000
committerRobert Speicher <robert@gitlab.com>2015-11-19 14:41:44 +0000
commitc8074b6b115c95c68d5f7df300a391b4eab521d5 (patch)
treed2a30073f3237ae1e1ce90c1f62bb77e2cef5460 /lib/support
parent587ab57f4a58d31b8b0c98aeb4b83cf4cb2c69f7 (diff)
parent372dcc217eeb379f603c10c81115dd7579762b59 (diff)
downloadgitlab-ce-c8074b6b115c95c68d5f7df300a391b4eab521d5.tar.gz
Merge branch 'client-max-body-size' into 'master'
Do not limit workhorse POST/PUT size in NGINX Limiting, if any, should happen in gitlab-workhorse. See merge request !1831
Diffstat (limited to 'lib/support')
-rw-r--r--lib/support/nginx/gitlab4
-rw-r--r--lib/support/nginx/gitlab-ssl4
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index acc547afcce..0cf5292b290 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -114,7 +114,6 @@ server {
}
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;
@@ -140,7 +139,6 @@ server {
# Build artifacts should be submitted to this location
location ~ ^/[\w\.-]+/[\w\.-]+/builds/download {
- client_max_body_size 0;
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block
error_page 418 = @gitlab-workhorse;
return 418;
@@ -148,13 +146,13 @@ server {
# Build artifacts should be submitted to this location
location ~ /ci/api/v1/builds/[0-9]+/artifacts {
- 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 @gitlab-workhorse {
+ client_max_body_size 0;
## If you use HTTPS make sure you disable gzip compression
## to be safe against BREACH attack.
# gzip off;
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index a8f8d48eb1f..31a651c87fd 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -161,7 +161,6 @@ server {
}
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;
@@ -187,7 +186,6 @@ server {
# Build artifacts should be submitted to this location
location ~ ^/[\w\.-]+/[\w\.-]+/builds/download {
- client_max_body_size 0;
# 'Error' 418 is a hack to re-use the @gitlab-workhorse block
error_page 418 = @gitlab-workhorse;
return 418;
@@ -195,13 +193,13 @@ server {
# Build artifacts should be submitted to this location
location ~ /ci/api/v1/builds/[0-9]+/artifacts {
- 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 @gitlab-workhorse {
+ client_max_body_size 0;
## If you use HTTPS make sure you disable gzip compression
## to be safe against BREACH attack.
gzip off;