update signature badges to reflect new states

7 files changed, 30 insertions, 5 deletions

diff --git a/app/views/projects/commit/_other_user_signature_badge.html.haml b/app/views/projects/commit/_other_user_signature_badge.html.haml
new file mode 100644
index 00000000000..1f4e44d4b48
--- /dev/null
+++ b/app/views/projects/commit/_other_user_signature_badge.html.haml
@@ -0,0 +1,12 @@
+- title = capture do
+  .gpg-popover-icon.invalid
+    = render 'shared/icons/icon_status_notfound_borderless.svg'
+  %div
+    This commit was signed with a different user's verified signature.
+
+- content = capture do
+  = render partial: 'projects/commit/signature_badge_user', locals: { signature: signature }
+
+- locals = { signature: signature, title: title, content: content, label: 'Unverified', css_classes: ['invalid'] }
+
+= render partial: 'projects/commit/signature_badge', locals: locals
diff --git a/app/views/projects/commit/_same_user_different_email_signature_badge.html.haml b/app/views/projects/commit/_same_user_different_email_signature_badge.html.haml
new file mode 100644
index 00000000000..7cafc2967e9
--- /dev/null
+++ b/app/views/projects/commit/_same_user_different_email_signature_badge.html.haml
@@ -0,0 +1,13 @@
+- title = capture do
+  .gpg-popover-icon.invalid
+    = render 'shared/icons/icon_status_notfound_borderless.svg'
+  %div
+    This commit was signed with a verified signature, but the committer email
+    is <strong>not verified</strong> to belong to the same user.
+
+- content = capture do
+  = render partial: 'projects/commit/signature_badge_user', locals: { signature: signature }
+
+- locals = { signature: signature, title: title, content: content, label: 'Unverified', css_classes: ['invalid'] }
+
+= render partial: 'projects/commit/signature_badge', locals: locals
diff --git a/app/views/projects/commit/_signature.html.haml b/app/views/projects/commit/_signature.html.haml
index 7598aa90b5b..145bc629380 100644
--- a/app/views/projects/commit/_signature.html.haml
+++ b/app/views/projects/commit/_signature.html.haml
@@ -1,5 +1,2 @@
 - if signature
-  - if signature.verified?
-    = render partial: 'projects/commit/valid_signature_badge', locals: { signature: signature }
-  - else
-    = render partial: 'projects/commit/invalid_signature_badge', locals: { signature: signature }
+  = render partial: "projects/commit/#{signature.verification_status}_signature_badge", locals: { signature: signature }
diff --git a/app/views/projects/commit/_unknown_key_signature_badge.html.haml b/app/views/projects/commit/_unknown_key_signature_badge.html.haml
new file mode 100644
index 00000000000..75c5cf57bcc
--- /dev/null
+++ b/app/views/projects/commit/_unknown_key_signature_badge.html.haml
@@ -0,0 +1 @@
+= render partial: 'projects/commit/unverified_signature_badge', locals: { signature: signature }
diff --git a/app/views/projects/commit/_unverified_key_signature_badge.html.haml b/app/views/projects/commit/_unverified_key_signature_badge.html.haml
new file mode 100644
index 00000000000..75c5cf57bcc
--- /dev/null
+++ b/app/views/projects/commit/_unverified_key_signature_badge.html.haml
@@ -0,0 +1 @@
+= render partial: 'projects/commit/unverified_signature_badge', locals: { signature: signature }
diff --git a/app/views/projects/commit/_invalid_signature_badge.html.haml b/app/views/projects/commit/_unverified_signature_badge.html.haml
index 3a73aae9d95..3a73aae9d95 100644
--- a/app/views/projects/commit/_invalid_signature_badge.html.haml
+++ b/app/views/projects/commit/_unverified_signature_badge.html.haml
diff --git a/app/views/projects/commit/_valid_signature_badge.html.haml b/app/views/projects/commit/_verified_signature_badge.html.haml
index 62819c09b3f..d9fefcdfbb3 100644
--- a/app/views/projects/commit/_valid_signature_badge.html.haml
+++ b/app/views/projects/commit/_verified_signature_badge.html.haml
@@ -2,7 +2,8 @@
   .gpg-popover-icon.valid
     = render 'shared/icons/icon_status_success_borderless.svg'
   %div
-    This commit was signed with a <strong>verified</strong> signature.
+    This commit was signed with a <strong>verified</strong> signature and the
+    committer email is verified to belong to the same user.
 
 - content = capture do
   = render partial: 'projects/commit/signature_badge_user', locals: { signature: signature }