diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-19 12:29:47 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-19 09:44:12 -0500 |
| commit | 71cb328b4aafcfb772801e50033f686cbc3755ed (patch) | |
| tree | 5fcfaac31eb19223864b593721b18e1cd4ad2463 | |
| parent | 2dd4314faea057ac6c51463455665d3b326cc679 (diff) | |
| download | gitlab-ce-71cb328b4aafcfb772801e50033f686cbc3755ed.tar.gz | |
Merge branch 'update_nginx_deploy' into 'master'
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
| -rw-r--r-- | lib/support/nginx/gitlab | 2 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index f38e2e62097..0cf5292b290 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -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. diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index 4cc6a17db04..31a651c87fd 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -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. |