diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-02-21 12:55:28 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-21 12:55:28 -0700 |
| commit | 2a9eed6620fd57c2a82edf5eab95dade3da250d3 (patch) | |
| tree | d4c33eaaae008510086b0476db9bd4ae32dc298e /app/views/layouts | |
| parent | 83e2a1ca12372279cf7948b4d4b3e8a11c50e428 (diff) | |
| parent | 71e146999c405ab301cd3c3e3aa03b89d46c461e (diff) | |
| download | gitlab-ce-2a9eed6620fd57c2a82edf5eab95dade3da250d3.tar.gz | |
Merge branch 'master' into rails-4.1.9
Conflicts:
app/views/projects/commits/_commit.html.haml
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue_context.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/show/_context.html.haml
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_head.html.haml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index bece8061fb9..d12145651af 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -1,12 +1,5 @@ %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 |