Merge branch 'rel-url-bugfix' into 'master'

Do not serve anything via nginx as we have workhorse

Otherwise this might 'hide' problems
https://github.com/gitlabhq/gitlabhq/issues/10053#issuecomment-188919319

Similar MR to gitlab for source based installations: gitlab-org/gitlab-ce!2995

See merge request !662

CHANGELOG.md

@@ -15,6 +15,7 @@ omnibus-gitlab repository.
 - Update postgresql to 9.2.15 to address CVE-2016-0773 (Takuya Noguchi) 16bf321
 - If gitlab rails is disabled, reconfigure needs to run without errors 5e695aac
 - Update mattermost to v2.1.0 f555c232
+- No static content delivery via nginx anymore as we have workhorse (Artem Sidorenko)
 
 8.5.7
 

files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb

@@ -59,7 +59,6 @@ server {
 <% end %>
   server_name <%= @fqdn %>;
   server_tokens off; ## Don't show the nginx version number, a security best practice
-  root /opt/gitlab/embedded/service/gitlab-rails/public;
 
   ## Increase this if you want to upload large attachments
   ## Or if you want to accept large git objects over http
@@ -113,5 +112,14 @@ server {
     proxy_pass http://gitlab-workhorse;
   }
 
+  error_page 404 /404.html;
+  error_page 422 /422.html;
+  error_page 500 /500.html;
+  error_page 502 /502.html;
+  location ~ ^/(404|422|500|502)\.html$ {
+    root /opt/gitlab/embedded/service/gitlab-rails/public;
+    internal;
+  }
+
   <%= @custom_gitlab_server_config %>
 }