Merge branch 'nicer_502' into 'master'

Nicer 502 Former-commit-id: 197a704f

Merge branch 'nicer_502' into 'master'
22353807 · Dmitriy Zaporozhets · 7bc3659d · d3c78e0d · 22353807 · 22353807
Commit 22353807 authored 11 years ago by Dmitriy Zaporozhets
--- 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>