diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 11:37:01 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 11:37:01 +0000 |
| commit | bb7af46d324303f086832d77128eff7c7644f172 (patch) | |
| tree | 5ed54988c996cb68d22801785cd1be01bd0e7861 | |
| parent | f28bbf9468458864ad5e883c48309a40ea99b63a (diff) | |
| parent | b4f0dcc7df786fd01f6fc357d102bc834433a3c7 (diff) | |
| download | gitlab-ce-bb7af46d324303f086832d77128eff7c7644f172.tar.gz | |
Merge branch 'fix-header-logo-link' into 'master'
Fix the logo in header not being an anchor link.
## What does this MR do?
Adds an actual link to the Tanuki in the header instead of a `Turbolinks.visit()`.
## Are there points in the code the reviewer needs to double check?
Do we care that this reverts the Safari issue fixed in !2690? I feel bad, but it's hacky and there's not a great way to fix it here.
## Why was this MR needed?
You couldn't open the home page in a new tab before, it was very annoying.
## What are the relevant issue numbers?
Fixes #18604
cc: @rspeicher
See merge request !4661
| -rw-r--r-- | app/assets/javascripts/logo.js.coffee | 6 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/assets/javascripts/logo.js.coffee b/app/assets/javascripts/logo.js.coffee index 9fdc27a9787..dc2590a0355 100644 --- a/app/assets/javascripts/logo.js.coffee +++ b/app/assets/javascripts/logo.js.coffee @@ -42,9 +42,3 @@ work = -> $(document).on('page:fetch', start) $(document).on('page:change', stop) - -$ -> - # Make logo clickable as part of a workaround for Safari visited - # link behaviour (See !2690). - $('#logo').on 'click', -> - Turbolinks.visit('/') diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index a0f560a13ec..ef31520f5cb 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -50,7 +50,7 @@ %h1.title= title .header-logo - #logo + = link_to root_path, class: 'home', title: 'Dashboard', id: 'logo' do = brand_header_logo = yield :header_content |