diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-11-06 20:01:51 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-11-06 20:01:51 +0000 |
commit | 50e8fe348c638812b8316fb9494aa29b37dcf50f (patch) | |
tree | 082bd6e7bfca930128cdcc7ce1506527177436c3 /app | |
parent | 9de635bd953518c19ceb18bb2156e26ba9e73924 (diff) | |
parent | e459deec8529cf1de180eb484a9a70910dff6f74 (diff) | |
download | gitlab-ce-50e8fe348c638812b8316fb9494aa29b37dcf50f.tar.gz |
Merge branch '38385-gpg-tooltips-not-working-in-safari' into 'master'
Resolve "GPG tooltips not working in Safari"
Closes #38385
See merge request gitlab-org/gitlab-ce!15228
Diffstat (limited to 'app')
-rw-r--r-- | app/views/projects/commit/_ajax_signature.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/commit/_signature_badge.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/commit/_ajax_signature.html.haml b/app/views/projects/commit/_ajax_signature.html.haml index 83821326aec..1d6a0fa38ca 100644 --- a/app/views/projects/commit/_ajax_signature.html.haml +++ b/app/views/projects/commit/_ajax_signature.html.haml @@ -1,2 +1,2 @@ - if commit.has_signature? - %button{ class: commit_signature_badge_classes('js-loading-gpg-badge'), data: { toggle: 'tooltip', placement: 'auto top', title: 'GPG signature (loading...)', 'commit-sha' => commit.sha } } + %a{ href: '#', tabindex: 0, class: commit_signature_badge_classes('js-loading-gpg-badge'), data: { toggle: 'tooltip', placement: 'auto top', title: 'GPG signature (loading...)', 'commit-sha' => commit.sha } } diff --git a/app/views/projects/commit/_signature_badge.html.haml b/app/views/projects/commit/_signature_badge.html.haml index edff018ba6d..b6b7aae6f9a 100644 --- a/app/views/projects/commit/_signature_badge.html.haml +++ b/app/views/projects/commit/_signature_badge.html.haml @@ -24,5 +24,5 @@ = link_to('Learn more about signing commits', help_page_path('user/project/repository/gpg_signed_commits/index.md'), class: 'gpg-popover-help-link') -%button{ class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'auto top', title: title, content: content } } +%a{ href: '#', tabindex: 0, class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'auto top', title: title, content: content } } = label |