Merge branch 'nicer_502' into 'master'

Nicer 502

Merge branch 'nicer_502' into 'master'
Nicer 502
197a704f · Dmitriy Zaporozhets · 4f3876a2 · 5de16dee · 197a704f · 197a704f
Commit 197a704f authored Jan 30, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

lib/support/nginx/gitlab lib/support/nginx/gitlab +2 -0

public/502.html public/502.html +13 -0

No files found.
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -53,5 +53,7 @@ server {

    proxy_pass http://gitlab;
  }
+
+  error_page 502 /502.html;
 }

--- a/public/502.html
+++ b/public/502.html
+<!DOCTYPE html>
+<html>
+<head>
+  <title>GitLab is not responding (502)</title>
+  <link href="/static.css" media="screen" rel="stylesheet" type="text/css" />
+</head>
+<body>
+  <h1>502</h1>
+  <h3>GitLab is not responding.</h3>
+  <hr/>
+  <p>Please contact your administrator if this problem persists.</p>
+</body>
+</html>