Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

4 files changed, 9 insertions, 11 deletions

diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index b6719834358..8a960602536 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -9,7 +9,7 @@
 
 .signup-page
   = render 'devise/shared/signup_box',
-    url: registration_path(resource_name),
+    url: registration_path(resource_name, glm_tracking_params.to_hash),
     button_text: _('Register'),
     borderless: Feature.enabled?(:restyle_login_page, @project),
     show_omniauth_providers: omniauth_enabled? && button_based_providers_enabled?
diff --git a/app/views/devise/sessions/_new_ldap.html.haml b/app/views/devise/sessions/_new_ldap.html.haml
index d06043c1750..7affbafbdeb 100644
--- a/app/views/devise/sessions/_new_ldap.html.haml
+++ b/app/views/devise/sessions/_new_ldap.html.haml
@@ -10,10 +10,10 @@
     = label_tag :password
     = password_field_tag :password, nil, { autocomplete: 'current-password', class: "form-control gl-form-input bottom", title: _("This field is required."), data: { qa_selector: 'password_field' }, required: true }
   - if !hide_remember_me && devise_mapping.rememberable?
-    .remember-me.gl-px-5
-      %label{ for: "remember_me" }
-        = check_box_tag :remember_me, '1', false, id: 'remember_me'
-        %span= _('Remember me')
+    .gl-px-5
+      = render Pajamas::CheckboxTagComponent.new(name: 'remember_me') do |c|
+        = c.label do
+          = _('Remember me')
 
   .submit-container.move-submit-down.gl-px-5.gl-pb-5
     = submit_tag submit_message, class: "gl-button btn btn-confirm", data: { qa_selector: 'sign_in_button' }
diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml
index d4f34a1cb3f..439a2fc4d96 100644
--- a/app/views/devise/shared/_omniauth_box.html.haml
+++ b/app/views/devise/shared/_omniauth_box.html.haml
@@ -13,8 +13,6 @@
         %span.gl-button-text
           = label_for_provider(provider)
   - unless hide_remember_me
-    %fieldset
-      %label{ class: restyle_login_page_enabled ? 'gl-font-weight-normal' : '' }
-        = check_box_tag :remember_me, nil, false
-        %span
-          = _('Remember me')
+    = render Pajamas::CheckboxTagComponent.new(name: 'remember_me', value: nil) do |c|
+      = c.label do
+        = _('Remember me')
diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml
index e81a5928983..76c4cf41a2d 100644
--- a/app/views/devise/shared/_tabs_ldap.html.haml
+++ b/app/views/devise/shared/_tabs_ldap.html.haml
@@ -1,7 +1,7 @@
 - show_password_form = local_assigns.fetch(:show_password_form, password_authentication_enabled_for_web?)
 - render_signup_link = local_assigns.fetch(:render_signup_link, true)
 
-%ul.nav-links.new-session-tabs.nav-tabs.nav{ class: "#{"custom-provider-tabs" if any_form_based_providers_enabled?} #{"nav-links-unboxed" if Feature.enabled?(:restyle_login_page, @project)}" }
+%ul.nav-links.new-session-tabs.nav-tabs.nav{ class: "#{'custom-provider-tabs' if any_form_based_providers_enabled?} #{'nav-links-unboxed' if Feature.enabled?(:restyle_login_page, @project)}" }
   - if crowd_enabled?
     %li.nav-item
       = link_to _("Crowd"), "#crowd", class: "nav-link #{active_when(form_based_auth_provider_has_active_class?(:crowd))}", 'data-toggle' => 'tab', role: 'tab'