Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-09-28 21:12:54 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-28 21:12:54 +0300
commit46c019ae69759f91eb6e71e4aa4dd9b23b136f60 (patch)
treee10adff0692edd28275aa66a3a27a8b15c5fbd0c /app/views/devise
parent33d999642a05b1c83c8230cac46086493e7fb368 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/devise')
-rw-r--r--app/views/devise/sessions/_new_base.html.haml6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml
index e6551adffde..88dd4fd1721 100644
--- a/app/views/devise/sessions/_new_base.html.haml
+++ b/app/views/devise/sessions/_new_base.html.haml
@@ -15,14 +15,12 @@
= link_to _('Forgot your password?'), new_password_path(:user)
.form-group
- - if Feature.enabled?(:arkose_labs_login_challenge)
- = render_if_exists 'devise/sessions/arkose_labs'
- - elsif captcha_enabled? || captcha_on_login_required?
+ - if captcha_enabled? || captcha_on_login_required?
= recaptcha_tags nonce: content_security_policy_nonce
- if remember_me_enabled?
.form-group
= f.gitlab_ui_checkbox_component :remember_me, _('Remember me'), checkbox_options: { autocomplete: 'off' }
- = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm, block: true, button_options: { class: "js-sign-in-button #{'js-no-auto-disable' if Feature.enabled?(:arkose_labs_login_challenge)}", data: { qa_selector: 'sign_in_button', testid: 'sign-in-button' } }) do
+ = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm, block: true, button_options: { class: 'js-sign-in-button', data: { qa_selector: 'sign_in_button', testid: 'sign-in-button' } }) do
= _('Sign in')