Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx
Conflicts: lib/support/nginx/gitlab lib/support/nginx/gitlab-ssl
This commit is contained in:
commit
51349ca3c8
3 changed files with 20 additions and 7 deletions
|
@ -1,12 +1,5 @@
|
||||||
%head
|
%head
|
||||||
%meta{charset: "utf-8"}
|
%meta{charset: "utf-8"}
|
||||||
|
|
||||||
-# Go repository retrieval support
|
|
||||||
-# Need to be the fist thing in the head
|
|
||||||
-# Since Go is using an XML parser to process HTML5
|
|
||||||
-# https://github.com/gitlabhq/gitlabhq/pull/5958#issuecomment-45397555
|
|
||||||
- if controller_name == 'projects' && action_name == 'show'
|
|
||||||
%meta{name: "go-import", content: "#{@project.web_url_without_protocol} git #{@project.web_url}.git"}
|
|
||||||
%meta{content: "GitLab Community Edition", name: "description"}
|
%meta{content: "GitLab Community Edition", name: "description"}
|
||||||
|
|
||||||
%title
|
%title
|
||||||
|
|
|
@ -77,6 +77,16 @@ server {
|
||||||
proxy_pass http://gitlab;
|
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,
|
## If a file, which is not found in the root folder is requested,
|
||||||
## then the proxy passes the request to the upsteam (gitlab unicorn).
|
## then the proxy passes the request to the upsteam (gitlab unicorn).
|
||||||
location @gitlab {
|
location @gitlab {
|
||||||
|
|
|
@ -123,6 +123,16 @@ server {
|
||||||
proxy_pass http://gitlab;
|
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,
|
## If a file, which is not found in the root folder is requested,
|
||||||
## then the proxy passes the request to the upsteam (gitlab unicorn).
|
## then the proxy passes the request to the upsteam (gitlab unicorn).
|
||||||
location @gitlab {
|
location @gitlab {
|
||||||
|
|
Loading…
Reference in a new issue