diff options
| author | Phil Hughes <me@iamphill.com> | 2017-11-16 12:08:15 +0300 |
|---|---|---|
| committer | Tiago <tiagonbotelho@hotmail.com> | 2017-11-16 13:20:05 +0300 |
| commit | 62f3f9ef368e15e14a509dbd7612910c249bae80 (patch) | |
| tree | a642a09336027906dd6666341af01005270da2f9 /app | |
| parent | 209ed43a0cc9fde2f5268537438f9e39136ac787 (diff) | |
Merge branch '40198-fix-gpg-badge-links' into 'master'
Resolve "Clicking on GPG verification badge jumps to top of the page"
Closes #40198
See merge request gitlab-org/gitlab-ce!15407
(cherry picked from commit 3ba84d4ba5953f5cf603fbf7e0e2d2bcf03f93eb)
d75b3380 fix issue where clicking GPG verification badge would cause page to scroll to top
4a5046c4 add CHANGELOG.md entry for !15407
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 1d6a0fa38ca..36b28c731a1 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? - %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 } } + %a{ href: 'javascript:void(0)', 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 b6b7aae6f9a..44aa8002f12 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') -%a{ href: '#', tabindex: 0, class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'auto top', title: title, content: content } } +%a{ href: 'javascript:void(0)', tabindex: 0, class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'auto top', title: title, content: content } } = label |