diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-25 17:13:23 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-25 17:13:23 +0000 |
| commit | b79c5c40e18086f10b849d069bc1c496a851cbae (patch) | |
| tree | d0c92a3d1997dd8d4016f83d053fd46816eecdb0 /lib | |
| parent | c295f0d2cc910bb0b719d28ae22adf34fea95c59 (diff) | |
| parent | d85f65ef4e07fc0c58d51b2e943ad2acb87ef461 (diff) | |
| download | gitlab-ce-b79c5c40e18086f10b849d069bc1c496a851cbae.tar.gz | |
Merge branch 'rs-503-page' into 'master'
Add a branded 503 static error page
[ci skip]
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398
See merge request !3894
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/support/nginx/gitlab | 3 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index 1324e4cd267..d521de28e8a 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -61,7 +61,8 @@ server { error_page 422 /422.html; error_page 500 /500.html; error_page 502 /502.html; - location ~ ^/(404|422|500|502)\.html$ { + error_page 503 /503.html; + location ~ ^/(404|422|500|502|503)\.html$ { root /home/git/gitlab/public; internal; } diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index af6ea9ed706..bf014b56cf6 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -105,7 +105,8 @@ server { error_page 422 /422.html; error_page 500 /500.html; error_page 502 /502.html; - location ~ ^/(404|422|500|502)\.html$ { + error_page 503 /503.html; + location ~ ^/(404|422|500|502|503)\.html$ { root /home/git/gitlab/public; internal; } |