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
Jérome Perrin
gitlab-ce
Commits
7ad7222a
Commit
7ad7222a
authored
Aug 24, 2017
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
simplify if/else with guards
parent
00392d92
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
lib/gitlab/gpg/commit.rb
lib/gitlab/gpg/commit.rb
+7
-7
No files found.
lib/gitlab/gpg/commit.rb
View file @
7ad7222a
...
@@ -83,16 +83,16 @@ module Gitlab
...
@@ -83,16 +83,16 @@ module Gitlab
end
end
def
verification_status
(
gpg_key
)
def
verification_status
(
gpg_key
)
if
gpg_key
&&
gpg_key
.
verified_and_belongs_to_email?
(
@commit
.
committer_email
)
&&
verified_signature
.
valid?
return
GpgSignature
.
verification_statuses
[
:unknown_key
]
unless
gpg_key
return
GpgSignature
.
verification_statuses
[
:unverified_key
]
unless
gpg_key
.
verified?
return
GpgSignature
.
verification_statuses
[
:unverified
]
unless
verified_signature
.
valid?
if
gpg_key
.
verified_and_belongs_to_email?
(
@commit
.
committer_email
)
GpgSignature
.
verification_statuses
[
:verified
]
GpgSignature
.
verification_statuses
[
:verified
]
elsif
gpg_key
&&
gpg_key
.
verified?
&&
verified_signature
.
valid?
&&
gpg_key
.
user
.
all_emails
.
include?
(
@commit
.
committer_email
)
elsif
gpg_key
.
user
.
all_emails
.
include?
(
@commit
.
committer_email
)
GpgSignature
.
verification_statuses
[
:same_user_different_email
]
GpgSignature
.
verification_statuses
[
:same_user_different_email
]
elsif
gpg_key
&&
gpg_key
.
verified?
&&
verified_signature
.
valid?
GpgSignature
.
verification_statuses
[
:other_user
]
elsif
gpg_key
GpgSignature
.
verification_statuses
[
:unverified_key
]
else
else
GpgSignature
.
verification_statuses
[
:
unknown_key
]
GpgSignature
.
verification_statuses
[
:
other_user
]
end
end
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