diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-07 17:47:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-07 17:47:00 +0300 |
| commit | 08086ff522742c28a6b10e9b2ed71f0af6633e5b (patch) | |
| tree | 5a4fde8b23140cb4edf04b24854b53f87085dd42 /app/views/devise | |
| parent | 8f3fbbf0d56091ad87158f61bf2a4e96a7f937e3 (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'app/views/devise')
| -rw-r--r-- | app/views/devise/sessions/_new_base.html.haml | 2 | ||||
| -rw-r--r-- | app/views/devise/shared/_signup_box.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml index 98af69d43b7..82c0df354d4 100644 --- a/app/views/devise/sessions/_new_base.html.haml +++ b/app/views/devise/sessions/_new_base.html.haml @@ -17,7 +17,7 @@ = link_to _('Forgot your password?'), new_password_path(:user) %div - if captcha_enabled? || captcha_on_login_required? - = recaptcha_tags + = recaptcha_tags nonce: content_security_policy_nonce .submit-container.move-submit-down = f.submit _('Sign in'), class: 'gl-button btn btn-confirm', data: { qa_selector: 'sign_in_button' } diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index 56f74916d8f..1b410f0b671 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -11,7 +11,7 @@ .devise-errors = render 'devise/shared/error_messages', resource: resource - if Gitlab::CurrentSettings.invisible_captcha_enabled - = invisible_captcha + = invisible_captcha nonce: true .name.form-row .col.form-group = f.label :first_name, _('First name'), for: 'new_user_first_name', class: 'label-bold' @@ -34,7 +34,7 @@ %p.gl-field-hint.text-secondary= s_('SignUp|Minimum length is %{minimum_password_length} characters.') % { minimum_password_length: @minimum_password_length } %div - if show_recaptcha_sign_up? - = recaptcha_tags + = recaptcha_tags nonce: content_security_policy_nonce .submit-container = f.submit button_text, class: 'btn gl-button btn-confirm', data: { qa_selector: 'new_user_register_button' } = render 'devise/shared/terms_of_service_notice', button_text: button_text |