diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-09-22 07:51:36 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-09-22 07:51:36 +0000 |
| commit | 548b7ce80486f98f3685562a46c478116dd4558b (patch) | |
| tree | 46b4fa92badc216e4dee328b43bd913b78b76604 /lib | |
| parent | eb5fd3f86b96c32353cc6e1d0ae2bada50209fa2 (diff) | |
| parent | 156ace47783097e05f855a159f6d6f43d1ec4ce0 (diff) | |
| download | gitlab-ce-548b7ce80486f98f3685562a46c478116dd4558b.tar.gz | |
Merge branch 'fix-ci-migration-docs' into 'master'
Add missing rake and change nginx config for CI migration
/cc @marin
See merge request !1385
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/support/nginx/gitlab_ci | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/support/nginx/gitlab_ci b/lib/support/nginx/gitlab_ci index ce179d6f599..bf05edfd780 100644 --- a/lib/support/nginx/gitlab_ci +++ b/lib/support/nginx/gitlab_ci @@ -18,18 +18,6 @@ server { proxy_pass $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri; } - # expose build endpoint to allow trigger builds - location ~ ^/projects/\d+/build$ { - proxy_read_timeout 300; - proxy_connect_timeout 300; - proxy_redirect off; - proxy_set_header X-Real-IP $remote_addr; - - # You need to specify your DNS servers that are able to resolve YOUR_GITLAB_SERVER_FQDN - resolver 8.8.8.8 8.8.4.4; - proxy_pass $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri; - } - # redirect all other CI requests location / { return 301 $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri; |