diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-11-06 20:01:51 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-11-10 15:47:39 +0800 |
| commit | 2b72f55810284e225c763fab2c5eb1641702112e (patch) | |
| tree | 45f76b9824ce27988a34ad808eb5d4eb4b59c799 | |
| parent | 7ce0930dd8e52c0f4561134e66b7f0e0f9a84a61 (diff) | |
| download | gitlab-ce-2b72f55810284e225c763fab2c5eb1641702112e.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
3 files changed, 7 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 diff --git a/changelogs/unreleased/38385-gpg-tooltips-not-working-in-safari.yml b/changelogs/unreleased/38385-gpg-tooltips-not-working-in-safari.yml new file mode 100644 index 00000000000..c7e840f0723 --- /dev/null +++ b/changelogs/unreleased/38385-gpg-tooltips-not-working-in-safari.yml @@ -0,0 +1,5 @@ +--- +title: Fix GPG signature popup info in Safari and Firefox +merge_request: 15228 +author: +type: fixed |