summaryrefslogtreecommitdiff
path: root/lib/support/nginx/gitlab
diff options
context:
space:
mode:
authordosire <sytses@gmail.com>2013-12-30 14:27:18 +0100
committerdosire <sytses@gmail.com>2013-12-30 14:27:18 +0100
commit60e451fde4ea3212c97bc3246b08e82cce7bf390 (patch)
treeda408ebdf64fbd5f246f9d3f876c82eea8a294ca /lib/support/nginx/gitlab
parent24820d5eef31ea688ad7191722c02579240bf669 (diff)
downloadgitlab-ce-60e451fde4ea3212c97bc3246b08e82cce7bf390.tar.gz
Change canonical urls to GitLab Cloud.
Diffstat (limited to 'lib/support/nginx/gitlab')
-rw-r--r--lib/support/nginx/gitlab4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index 9f5155b3916..d1d959e152e 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -28,8 +28,8 @@ server {
# if a file, which is not found in the root folder is requested,
# then the proxy pass the request to the upsteam (gitlab unicorn)
location @gitlab {
- proxy_read_timeout 300; # https://github.com/gitlabhq/gitlabhq/issues/694
- proxy_connect_timeout 300; # https://github.com/gitlabhq/gitlabhq/issues/694
+ proxy_read_timeout 300; # Some requests take more than 30 seconds.
+ proxy_connect_timeout 300; # Some requests take more than 30 seconds.
proxy_redirect off;
proxy_set_header X-Forwarded-Proto $scheme;