Merge branch 'mattes-go-get-workaround-nginx'

626f5bab · Marin Jankovski · b180476b · 51349ca3 · 626f5bab · 626f5bab
Commit 626f5bab authored Feb 20, 2015 by Marin Jankovski
Showing with 20 additions and 7 deletions

app/views/layouts/_head.html.haml app/views/layouts/_head.html.haml +0 -7

lib/support/nginx/gitlab lib/support/nginx/gitlab +10 -0

lib/support/nginx/gitlab-ssl lib/support/nginx/gitlab-ssl +10 -0

No files found.
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
 %head
  %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"}

  %title

--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -77,6 +77,16 @@ 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 {

--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -123,6 +123,16 @@ 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 {