diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
| commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
| tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/views/devise | |
| parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) | |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/views/devise')
| -rw-r--r-- | app/views/devise/confirmations/new.html.haml | 7 | ||||
| -rw-r--r-- | app/views/devise/passwords/new.html.haml | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml index 51354618aa4..eee223ff63c 100644 --- a/app/views/devise/confirmations/new.html.haml +++ b/app/views/devise/confirmations/new.html.haml @@ -7,7 +7,12 @@ .form-group = f.label :email = f.email_field :email, class: "form-control gl-form-input", required: true, title: _('Please provide a valid email address.'), value: nil - .clearfix + + %div + - if recaptcha_enabled? + = recaptcha_tags nonce: content_security_policy_nonce + + .gl-mt-5 = f.submit _("Resend"), class: 'gl-button btn btn-confirm' .clearfix.prepend-top-20 diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml index 7f6ce712af2..7bbde4a39c7 100644 --- a/app/views/devise/passwords/new.html.haml +++ b/app/views/devise/passwords/new.html.haml @@ -8,7 +8,12 @@ = f.email_field :email, class: "form-control gl-form-input", required: true, value: params[:user_email], autofocus: true, title: _('Please provide a valid email address.') .form-text.text-muted = _('Requires your primary GitLab email address.') - .clearfix + + %div + - if recaptcha_enabled? + = recaptcha_tags nonce: content_security_policy_nonce + + .gl-mt-5 = f.submit _("Reset password"), class: "gl-button btn-confirm btn" .clearfix.prepend-top-20 |