summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/projects/commit/_valid_signature_badge.html.haml4
-rw-r--r--spec/features/commits_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/commit/_valid_signature_badge.html.haml b/app/views/projects/commit/_valid_signature_badge.html.haml
index 5a451cb4055..db1a41bbf64 100644
--- a/app/views/projects/commit/_valid_signature_badge.html.haml
+++ b/app/views/projects/commit/_valid_signature_badge.html.haml
@@ -16,8 +16,8 @@
= user_avatar_without_link(user: user, size: 32)
%div
- %strong= gpg_key.user.username
- %div= gpg_key.user.name
+ %strong= gpg_key.user.name
+ %div @#{gpg_key.user.username}
- else
= mail_to user_email do
%div
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index b6b0cc7e1d3..9bd4b478cce 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -285,8 +285,8 @@ describe 'Commits' do
click_on 'Verified'
within '.popover' do
expect(page).to have_content 'This commit was signed with a verified signature.'
- expect(page).to have_content 'nannie.bernhard'
expect(page).to have_content 'Nannie Bernhard'
+ expect(page).to have_content '@nannie.bernhard'
expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}"
end