Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
ccf3ed43
Commit
ccf3ed43
authored
Jul 13, 2017
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swap user's name and the user's username
parent
c5271833
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/projects/commit/_valid_signature_badge.html.haml
app/views/projects/commit/_valid_signature_badge.html.haml
+2
-2
spec/features/commits_spec.rb
spec/features/commits_spec.rb
+1
-1
No files found.
app/views/projects/commit/_valid_signature_badge.html.haml
View file @
ccf3ed43
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
=
user_avatar_without_link
(
user:
user
,
size:
32
)
=
user_avatar_without_link
(
user:
user
,
size:
32
)
%div
%div
%strong
=
gpg_key
.
user
.
user
name
%strong
=
gpg_key
.
user
.
name
%div
=
gpg_key
.
user
.
name
%div
@
#{
gpg_key
.
user
.
username
}
-
else
-
else
=
mail_to
user_email
do
=
mail_to
user_email
do
%div
%div
...
...
spec/features/commits_spec.rb
View file @
ccf3ed43
...
@@ -285,8 +285,8 @@ describe 'Commits' do
...
@@ -285,8 +285,8 @@ describe 'Commits' do
click_on
'Verified'
click_on
'Verified'
within
'.popover'
do
within
'.popover'
do
expect
(
page
).
to
have_content
'This commit was signed with a verified signature.'
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
'@nannie.bernhard'
expect
(
page
).
to
have_content
"GPG Key ID:
#{
GpgHelpers
::
User1
.
primary_keyid
}
"
expect
(
page
).
to
have_content
"GPG Key ID:
#{
GpgHelpers
::
User1
.
primary_keyid
}
"
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment