diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-17 03:08:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-17 03:08:20 +0300 |
| commit | 3f98f1e47b16b2b1d7a2e8a86252e002c2496098 (patch) | |
| tree | 197eb008d51c312f3fc06c1e4cd2ecdda69576ea /app/views/devise/confirmations/new.html.haml | |
| parent | d62742b0169769191b32038cf20445a47db3b287 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/devise/confirmations/new.html.haml')
| -rw-r--r-- | app/views/devise/confirmations/new.html.haml | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml index 0ce6d9b1095..eeec6e1fa40 100644 --- a/app/views/devise/confirmations/new.html.haml +++ b/app/views/devise/confirmations/new.html.haml @@ -1,23 +1,22 @@ = render 'devise/shared/tab_single', tab_title: 'Resend confirmation instructions' .login-box.gl-p-5 - .login-body - = gitlab_ui_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: 'gl-show-field-errors' }) do |f| - .devise-errors - = render "devise/shared/error_messages", resource: resource - .form-group - = f.label :email - = f.email_field :email, class: "form-control gl-form-input", required: true, autocomplete: 'off', title: _('Please provide a valid email address.'), value: nil - .form-text.gl-text-secondary - - emails_link = link_to('', profile_emails_url, target: '_blank', rel: 'noopener noreferrer') - = safe_format(s_('Requires your primary GitLab email address. If you want to confirm a secondary email address, go to %{emails_link_start}Emails%{emails_link_end}'), tag_pair(emails_link, :emails_link_start, :emails_link_end)) + = gitlab_ui_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: 'gl-show-field-errors' }) do |f| + .devise-errors + = render "devise/shared/error_messages", resource: resource + .form-group + = f.label :email + = f.email_field :email, class: "form-control gl-form-input", required: true, autocomplete: 'off', title: _('Please provide a valid email address.'), value: nil + .form-text.gl-text-secondary + - emails_link = link_to('', profile_emails_url, target: '_blank', rel: 'noopener noreferrer') + = safe_format(s_('Requires your primary GitLab email address. If you want to confirm a secondary email address, go to %{emails_link_start}Emails%{emails_link_end}'), tag_pair(emails_link, :emails_link_start, :emails_link_end)) - %div - - if recaptcha_enabled? - = recaptcha_tags nonce: content_security_policy_nonce + %div + - if recaptcha_enabled? + = recaptcha_tags nonce: content_security_policy_nonce - .gl-mt-5 - = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm, block: true) do - = _("Resend") + .gl-mt-5 + = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm, block: true) do + = _("Resend") .clearfix.prepend-top-20 = render 'devise/shared/sign_in_link' |