diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-13 16:08:14 +0200 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-27 15:44:39 +0200 |
| commit | ccf3ed4351ce45204035169c67ee7f3c01b05e81 (patch) | |
| tree | 0da614072bbf147d6c885b493d6cae0223e5562f | |
| parent | c52718332cb723cc4b3035c17eec9eeb9926c8cf (diff) | |
| download | gitlab-ce-ccf3ed4351ce45204035169c67ee7f3c01b05e81.tar.gz | |
swap user's name and the user's username
| -rw-r--r-- | app/views/projects/commit/_valid_signature_badge.html.haml | 4 | ||||
| -rw-r--r-- | spec/features/commits_spec.rb | 2 |
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 |