diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-03-03 19:53:20 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-03-03 19:53:20 +0000 |
| commit | a7fad44bd361c68c6f4ff0fbeb5ad067ef2b74b1 (patch) | |
| tree | 8c91c212ef8cabc38604270f474debeec3e5a36a /lib | |
| parent | c5b66532df4acc102c0c62c320ca8a8cf6115ff3 (diff) | |
| parent | 3702c4ad80614d71fc5ac3ea1af7c3789ec8146d (diff) | |
| download | gitlab-ce-a7fad44bd361c68c6f4ff0fbeb5ad067ef2b74b1.tar.gz | |
Merge branch 'go-import' into 'master'
Render go-import meta tag for private repos.
The previously solution (626f5bab3580926842aa6247e052008ddf1ca571) required a change to nginx config and broke visits from Googlebot and other clients including "go" in their user agent.
See merge request !1587
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/support/nginx/gitlab | 10 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 10 |
2 files changed, 0 insertions, 20 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index fd5b2664786..62a4276536c 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -77,16 +77,6 @@ server { proxy_pass http://gitlab; } - ## If ``go get`` detected, return go-import meta tag. - ## This works for public and for private repositories. - ## See also http://golang.org/cmd/go/#hdr-Remote_import_paths - if ($http_user_agent ~* "Go") { - return 200 " - <!DOCTYPE html> - <head><meta content='$host$uri git $scheme://$host$uri.git' name='go-import'></head> - </html>"; - } - ## If a file, which is not found in the root folder is requested, ## then the proxy passes the request to the upsteam (gitlab unicorn). location @gitlab { diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index a9699bac611..2aefc944698 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -123,16 +123,6 @@ server { proxy_pass http://gitlab; } - ## If ``go get`` detected, return go-import meta tag. - ## This works for public and for private repositories. - ## See also http://golang.org/cmd/go/#hdr-Remote_import_paths - if ($http_user_agent ~* "Go") { - return 200 " - <!DOCTYPE html> - <head><meta content='$host$uri git $scheme://$host$uri.git' name='go-import'></head> - </html>"; - } - ## If a file, which is not found in the root folder is requested, ## then the proxy passes the request to the upsteam (gitlab unicorn). location @gitlab { |