home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update_nginx_deploy' into 'master'

Browse Source 
Deploy page should be shown for all pages not just root

Related to change already merged to Omnibus - gitlab-org/omnibus-gitlab!540

This change makes it so the deploy page is shown on all GitLab pages if the page exists. Users will no longer receive the 502 when deploys are happening.

See merge request !1828
This commit is contained in:
Dmitriy Zaporozhets
2015-11-19 09:44:12 -05:00
committed by Robert Speicher
parent 2dd4314fae
commit 71cb328b4a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/support/nginx/gitlab
+1 -1
View File
@@ -67,7 +67,7 @@ server {
location / {
## Serve static files from defined root folder.
## @gitlab is a named location for the upstream fallback, see below.
try_files $uri $uri/index.html $uri.html @gitlab;
try_files $uri /index.html $uri.html @gitlab;
}
## We route uploads through GitLab to prevent XSS and enforce access control.
lib/support/nginx/gitlab-ssl
+1 -1
View File
@@ -112,7 +112,7 @@ server {
location / {
## Serve static files from defined root folder.
## @gitlab is a named location for the upstream fallback, see below.
try_files $uri $uri/index.html $uri.html @gitlab;
try_files $uri /index.html $uri.html @gitlab;
}
## We route uploads through GitLab to prevent XSS and enforce access control.