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 3ba84d4b) d75b3380 fix issue where clicking GPG verification badge would cause page to scroll to top 4a5046c4 add CHANGELOG.md entry for !15407

Merge branch '40198-fix-gpg-badge-links' into 'master'
62f3f9ef · Phil Hughes · Tiago · 209ed43a · 62f3f9ef · 62f3f9ef
Commit 62f3f9ef authored Nov 16, 2017 by Phil Hughes Committed by Tiago Nov 16, 2017
3 changed files
--- a/app/views/projects/commit/_ajax_signature.html.haml
+++ b/app/views/projects/commit/_ajax_signature.html.haml
 - 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 } }
--- 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
--- a/changelogs/unreleased/40198-fix-gpg-badge-links.yml
+++ b/changelogs/unreleased/40198-fix-gpg-badge-links.yml
+---
+title: Fix issue where clicking a GPG verification badge would scroll to the top of
+  the page
+merge_request: 15407
+author:
+type: fixed