diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 03:09:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 03:09:12 +0300 |
commit | 6168721025dd8e98caeb2bf6844273e6690eaf69 (patch) | |
tree | 8c4fb20d793669e488a739bc9951dab8b363eed4 /app/views/projects | |
parent | a89cb5cbdd832d4d9e80517973aceda6bc0a3856 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
6 files changed, 60 insertions, 5 deletions
diff --git a/app/views/projects/commit/_signature.html.haml b/app/views/projects/commit/_signature.html.haml index 145bc629380..aa7c90bad66 100644 --- a/app/views/projects/commit/_signature.html.haml +++ b/app/views/projects/commit/_signature.html.haml @@ -1,2 +1,3 @@ - if signature - = render partial: "projects/commit/#{signature.verification_status}_signature_badge", locals: { signature: signature } + - uri = "projects/commit/#{"x509/" if signature.instance_of?(X509CommitSignature)}" + = render partial: "#{uri}#{signature.verification_status}_signature_badge", locals: { signature: signature } diff --git a/app/views/projects/commit/_signature_badge.html.haml b/app/views/projects/commit/_signature_badge.html.haml index cbd998c60ef..776ce48d4bc 100644 --- a/app/views/projects/commit/_signature_badge.html.haml +++ b/app/views/projects/commit/_signature_badge.html.haml @@ -17,12 +17,18 @@ - content = capture do - if show_user .clearfix - = render partial: 'projects/commit/signature_badge_user', locals: { signature: signature } + - uri_signature_badge_user = "projects/commit/#{"x509/" if signature.instance_of?(X509CommitSignature)}signature_badge_user" + = render partial: "#{uri_signature_badge_user}", locals: { signature: signature } - = _('GPG Key ID:') - %span.monospace= signature.gpg_key_primary_keyid + - if signature.instance_of?(X509CommitSignature) + = render partial: "projects/commit/x509/certificate_details", locals: { signature: signature } - = link_to(_('Learn more about signing commits'), help_page_path('user/project/repository/gpg_signed_commits/index.md'), class: 'gpg-popover-help-link') + = link_to(_('Learn more about x509 signed commits'), help_page_path('user/project/repository/x509_signed_commits/index.md'), class: 'gpg-popover-help-link') + - else + = _('GPG Key ID:') + %span.monospace= signature.gpg_key_primary_keyid + + = link_to(_('Learn more about signing commits'), help_page_path('user/project/repository/gpg_signed_commits/index.md'), class: 'gpg-popover-help-link') %button{ tabindex: 0, class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'top', title: title, content: content } } = label diff --git a/app/views/projects/commit/x509/_certificate_details.html.haml b/app/views/projects/commit/x509/_certificate_details.html.haml new file mode 100644 index 00000000000..2357c6d803b --- /dev/null +++ b/app/views/projects/commit/x509/_certificate_details.html.haml @@ -0,0 +1,17 @@ +.gpg-popover-certificate-details + %strong= _('Certificate Subject') + %ul + - signature.x509_certificate.subject.split(",").each do |i| + - if i.start_with?("CN", "O") + %li= i + %li= _('Subject Key Identifier:') + %li.unstyled= signature.x509_certificate.subject_key_identifier.gsub(":", " ") + +.gpg-popover-certificate-details + %strong= _('Certificate Issuer') + %ul + - signature.x509_certificate.x509_issuer.subject.split(",").each do |i| + - if i.start_with?("CN", "OU", "O") + %li= i + %li= _('Subject Key Identifier:') + %li.unstyled= signature.x509_certificate.x509_issuer.subject_key_identifier.gsub(":", " ") diff --git a/app/views/projects/commit/x509/_signature_badge_user.html.haml b/app/views/projects/commit/x509/_signature_badge_user.html.haml new file mode 100644 index 00000000000..b64ccba2a18 --- /dev/null +++ b/app/views/projects/commit/x509/_signature_badge_user.html.haml @@ -0,0 +1,19 @@ +- user = signature.commit.committer +- user_email = signature.x509_certificate.email + +- if user + = link_to user_path(user), class: 'gpg-popover-user-link' do + %div + = user_avatar_without_link(user: user, size: 32) + + %div + %strong= user.name + %div= user.to_reference + +- else + = mail_to user_email do + %div + = user_avatar_without_link(user_email: user_email, size: 32) + + %div + %strong= user_email diff --git a/app/views/projects/commit/x509/_unverified_signature_badge.html.haml b/app/views/projects/commit/x509/_unverified_signature_badge.html.haml new file mode 100644 index 00000000000..680cc32c7e6 --- /dev/null +++ b/app/views/projects/commit/x509/_unverified_signature_badge.html.haml @@ -0,0 +1,6 @@ +- title = capture do + = _('This commit was signed with an <strong>unverified</strong> signature.').html_safe + +- locals = { signature: signature, title: title, label: _('Unverified'), css_class: 'invalid', icon: 'status_notfound_borderless', show_user: true } + += render partial: 'projects/commit/signature_badge', locals: locals diff --git a/app/views/projects/commit/x509/_verified_signature_badge.html.haml b/app/views/projects/commit/x509/_verified_signature_badge.html.haml new file mode 100644 index 00000000000..4964b1b8ee7 --- /dev/null +++ b/app/views/projects/commit/x509/_verified_signature_badge.html.haml @@ -0,0 +1,6 @@ +- title = capture do + = _('This commit was signed with a <strong>verified</strong> signature and the committer email is verified to belong to the same user.').html_safe + +- locals = { signature: signature, title: title, label: _('Verified'), css_class: 'valid', icon: 'status_success_borderless', show_user: true } + += render partial: 'projects/commit/signature_badge', locals: locals |