Commit ccf3ed43 authored by Alexis Reigel's avatar Alexis Reigel

swap user's name and the user's username

parent c5271833
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment