Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

8 files changed, 33 insertions, 35 deletions

diff --git a/app/views/profiles/_email_settings.html.haml b/app/views/profiles/_email_settings.html.haml
index 457d6690a78..0ca9acba2de 100644
--- a/app/views/profiles/_email_settings.html.haml
+++ b/app/views/profiles/_email_settings.html.haml
@@ -22,12 +22,12 @@
       { include_blank: s_("Profiles|Do not show on profile") },
       { class: 'gl-form-select custom-select', disabled: email_change_disabled }
   %small.form-text.text-gl-muted
-    = s_("Profiles|This email will be displayed on your public profile")
+    = s_("Profiles|This email will be displayed on your public profile.")
 
 .form-group.gl-form-group
   - commit_email_link_url = help_page_path('user/profile/index', anchor: 'change-the-email-displayed-on-your-commits', target: '_blank')
   - commit_email_link_start = '<a href="%{url}">'.html_safe % { url: commit_email_link_url }
-  - commit_email_docs_link = s_('Profiles|This email will be used for web based operations, such as edits and merges. %{commit_email_link_start}Learn more%{commit_email_link_end}').html_safe % { commit_email_link_start: commit_email_link_start, commit_email_link_end: '</a>'.html_safe }
+  - commit_email_docs_link = s_('Profiles|This email will be used for web based operations, such as edits and merges. %{commit_email_link_start}Learn more.%{commit_email_link_end}').html_safe % { commit_email_link_start: commit_email_link_start, commit_email_link_end: '</a>'.html_safe }
   = form.label :commit_email, s_('Profiles|Commit email')
   .gl-md-form-input-lg
     = form.select :commit_email,
diff --git a/app/views/profiles/_name.html.haml b/app/views/profiles/_name.html.haml
index 5af4fe24d62..d798eab7635 100644
--- a/app/views/profiles/_name.html.haml
+++ b/app/views/profiles/_name.html.haml
@@ -2,8 +2,8 @@
 - if user.read_only_attribute?(:name)
   = form.text_field :name, class: 'gl-form-input form-control', required: true, readonly: true
   %small.form-text.text-gl-muted
-    = s_("Profiles|Your name was automatically set based on your %{provider_label} account, so people you know can recognize you") % { provider_label: attribute_provider_label(:name) }
+    = s_("Profiles|Your name was automatically set based on your %{provider_label} account, so people you know can recognize you.") % { provider_label: attribute_provider_label(:name) }
 - else
   = form.text_field :name, class: 'gl-form-input form-control', required: true, title: s_("Profiles|Using emojis in names seems fun, but please try to set a status message instead")
   %small.form-text.text-gl-muted
-    = s_("Profiles|Enter your name, so people you know can recognize you")
+    = s_("Profiles|Enter your name, so people you know can recognize you.")
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index 745d3c62c5d..cdd5a9ae7a1 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -17,9 +17,9 @@
 .row.gl-mt-3.js-search-settings-section
   .col-lg-4.profile-settings-sidebar
     %h4.gl-mt-0
-      = s_('Profiles|Two-Factor Authentication')
+      = s_('Profiles|Two-factor authentication')
     %p
-      = s_("Profiles|Increase your account's security by enabling Two-Factor Authentication (2FA)")
+      = s_("Profiles|Increase your account's security by enabling two-factor authentication (2FA).")
   .col-lg-8
     %p
       #{_('Status')}: #{current_user.two_factor_enabled? ? _('Enabled') : _('Disabled')}
@@ -35,9 +35,9 @@
   .row.gl-mt-3.js-search-settings-section
     .col-lg-4.profile-settings-sidebar
       %h4.gl-mt-0
-        = s_('Profiles|Social sign-in')
+        = s_('Profiles|Service sign-in')
       %p
-        = s_('Profiles|Activate signin with one of the following services')
+        = s_('Profiles|Connect a service for sign-in.')
     .col-lg-8
       = render 'providers', providers: button_based_providers, group_saml_identities: local_assigns[:group_saml_identities]
     .col-lg-12
@@ -68,7 +68,7 @@
       = render 'users/deletion_guidance', user: current_user
 
       -# Delete button here
-      %button#delete-account-button.gl-button.btn.btn-danger.disabled{ data: { qa_selector: 'delete_account_button' } }
+      = render Pajamas::ButtonComponent.new(variant: :danger, button_options: { id: 'delete-account-button', disabled: true, data: { qa_selector: 'delete_account_button' }}) do
         = s_('Profiles|Delete account')
 
       #delete-account-modal{ data: { action_url: user_registration_path,
diff --git a/app/views/profiles/gpg_keys/_form.html.haml b/app/views/profiles/gpg_keys/_form.html.haml
index 9804a3b7735..b3784faed28 100644
--- a/app/views/profiles/gpg_keys/_form.html.haml
+++ b/app/views/profiles/gpg_keys/_form.html.haml
@@ -1,6 +1,6 @@
 %div
   = form_for [:profile, @gpg_key], html: { class: 'js-requires-input' } do |f|
-    = form_errors(@gpg_key)
+    = form_errors(@gpg_key, pajamas_alert: true)
 
     .form-group
       = f.label :key, s_('Profiles|Key'), class: 'label-bold'
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index 5d3e0720176..46ae602359f 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -15,7 +15,7 @@
       - else
         = _('Change your password or recover your current one')
     = form_for @user, url: profile_password_path, method: :put, html: {class: "update-password"} do |f|
-      = form_errors(@user)
+      = form_errors(@user, pajamas_alert: true)
 
       - unless @user.password_automatically_set?
         .form-group
@@ -25,7 +25,8 @@
             = _('You must provide your current password in order to change it.')
       .form-group
         = f.label :new_password, _('New password'), class: 'label-bold'
-        = f.password_field :new_password, required: true, autocomplete: 'new-password', class: 'form-control gl-form-input', data: { qa_selector: 'new_password_field' }
+        = f.password_field :new_password, required: true, autocomplete: 'new-password', class: 'form-control gl-form-input js-password-complexity-validation', data: { qa_selector: 'new_password_field' }
+        = render_if_exists 'shared/password_requirements_list'
       .form-group
         = f.label :password_confirmation, _('Password confirmation'), class: 'label-bold'
         = f.password_field :password_confirmation, required: true, autocomplete: 'new-password', class: 'form-control gl-form-input', data: { qa_selector: 'confirm_password_field' }
diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml
index a2180dc68a6..5bcc92dcdfd 100644
--- a/app/views/profiles/passwords/new.html.haml
+++ b/app/views/profiles/passwords/new.html.haml
@@ -9,7 +9,7 @@
     %br
     = _('After a successful password update you will be redirected to login screen.')
 
-  = form_errors(@user)
+  = form_errors(@user, pajamas_alert: true)
 
   - unless @user.password_automatically_set?
     .form-group.row
@@ -21,7 +21,8 @@
     .col-sm-2.col-form-label
       = f.label :new_password, _('New password')
     .col-sm-10
-      = f.password_field :new_password, required: true, autocomplete: 'new-password', class: 'form-control gl-form-input', data: { qa_selector: 'new_password_field' }
+      = f.password_field :new_password, required: true, autocomplete: 'new-password', class: 'form-control gl-form-input js-password-complexity-validation', data: { qa_selector: 'new_password_field' }
+      = render_if_exists 'shared/password_requirements_list'
   .form-group.row
     .col-sm-2.col-form-label
       = f.label :password_confirmation, _('Password confirmation')
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index d1f1ff892d5..dda1640968e 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -5,9 +5,7 @@
 - availability = availability_values
 - custom_emoji = show_status_emoji?(@user.status)
 
-= gitlab_ui_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user gl-mt-3 js-quick-submit gl-show-field-errors js-password-prompt-form', remote: true }, authenticity_token: true do |f|
-  = form_errors(@user)
-
+= gitlab_ui_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user js-edit-user gl-mt-3 js-quick-submit gl-show-field-errors js-password-prompt-form', remote: true }, authenticity_token: true do |f|
   .row.js-search-settings-section
     .col-lg-4.profile-settings-sidebar
       %h4.gl-mt-0
@@ -46,20 +44,18 @@
       %p= s_("Profiles|This emoji and message will appear on your profile and throughout the interface.")
     .col-lg-8
       = f.fields_for :status, @user.status do |status_form|
-        - emoji_button = button_tag type: :button,
-          class: 'js-toggle-emoji-menu emoji-menu-toggle-button btn gl-button btn-default has-tooltip',
-          title: s_("Profiles|Add status emoji") do
+        - emoji_button = render Pajamas::ButtonComponent.new(button_options: { title: s_("Profiles|Add status emoji"),
+            class: 'js-toggle-emoji-menu emoji-menu-toggle-button has-tooltip' } ) do
           - if custom_emoji
             = emoji_icon(@user.status.emoji, class: 'gl-mr-0!')
           %span#js-no-emoji-placeholder.no-emoji-placeholder{ class: ('hidden' if custom_emoji) }
             = sprite_icon('slight-smile', css_class: 'award-control-icon-neutral')
             = sprite_icon('smiley', css_class: 'award-control-icon-positive')
             = sprite_icon('smile', css_class: 'award-control-icon-super-positive')
-        - reset_message_button = button_tag type: :button,
-          id: 'js-clear-user-status-button',
-          class: 'clear-user-status btn gl-button btn-default has-tooltip',
-          title: s_("Profiles|Clear status") do
-          = sprite_icon("close")
+        - reset_message_button = render Pajamas::ButtonComponent.new(icon: 'close',
+          button_options: { id: 'js-clear-user-status-button',
+            class: 'has-tooltip',
+            title: s_("Profiles|Clear status") } )
 
         = status_form.hidden_field :emoji, id: 'js-status-emoji-field'
         .form-group.gl-form-group
@@ -76,7 +72,7 @@
         .form-group.gl-form-group
           = status_form.gitlab_ui_checkbox_component :availability,
             s_("Profiles|Busy"),
-            help_text: s_('Profiles|An indicator appears next to your name and avatar'),
+            help_text: s_('Profiles|An indicator appears next to your name and avatar.'),
             checkbox_options: { data: { testid: "user-availability-checkbox" } },
             checked_value: availability["busy"],
             unchecked_value: availability["not_set"]
@@ -85,7 +81,7 @@
   .row.user-time-preferences.js-search-settings-section
     .col-lg-4.profile-settings-sidebar
       %h4.gl-mt-0= s_("Profiles|Time settings")
-      %p= s_("Profiles|Set your local time zone")
+      %p= s_("Profiles|Set your local time zone.")
     .col-lg-8
       %h5= _("Time zone")
       = dropdown_tag(_("Select a time zone"), options: { toggle_class: 'gl-button btn js-timezone-dropdown input-lg gl-w-full!', title: _("Select a time zone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } )
@@ -97,7 +93,7 @@
       %h4.gl-mt-0
         = s_("Profiles|Main settings")
       %p
-        = s_("Profiles|This information will appear on your profile")
+        = s_("Profiles|This information will appear on your profile.")
         - if current_user.ldap_user?
           = s_("Profiles|Some options are unavailable for LDAP accounts")
     .col-lg-8
@@ -111,12 +107,12 @@
         = f.label :pronouns, s_('Profiles|Pronouns')
         = f.text_field :pronouns, class: 'gl-form-input form-control gl-md-form-input-lg'
         %small.form-text.text-gl-muted
-          = s_("Profiles|Enter your pronouns to let people know how to refer to you")
+          = s_("Profiles|Enter your pronouns to let people know how to refer to you.")
       .form-group.gl-form-group
         = f.label :pronunciation, s_('Profiles|Pronunciation')
         = f.text_field :pronunciation, class: 'gl-form-input form-control gl-md-form-input-lg'
         %small.form-text.text-gl-muted
-          = s_("Profiles|Enter how your name is pronounced to help people address you correctly")
+          = s_("Profiles|Enter how your name is pronounced to help people address you correctly.")
       = render_if_exists 'profiles/extra_settings', form: f
       = render_if_exists 'profiles/email_settings', form: f
       .form-group.gl-form-group
@@ -148,17 +144,17 @@
         = f.label :organization, s_('Profiles|Organization')
         = f.text_field :organization, class: 'gl-form-input form-control gl-md-form-input-lg'
         %small.form-text.text-gl-muted
-          = s_("Profiles|Who you represent or work for")
+          = s_("Profiles|Who you represent or work for.")
       .form-group.gl-form-group
         = f.label :bio, s_('Profiles|Bio')
         = f.text_area :bio, class: 'gl-form-input gl-form-textarea form-control', rows: 4, maxlength: 250
         %small.form-text.text-gl-muted
-          = s_("Profiles|Tell us about yourself in fewer than 250 characters")
+          = s_("Profiles|Tell us about yourself in fewer than 250 characters.")
       %hr
       %fieldset.form-group.gl-form-group
         %legend.col-form-label.col-form-label
           = _('Private profile')
-        - private_profile_label = s_("Profiles|Don't display activity-related personal information on your profile")
+        - private_profile_label = s_("Profiles|Don't display activity-related personal information on your profile.")
         - private_profile_help_link = link_to sprite_icon('question-o'), help_page_path('user/profile/index.md', anchor: 'make-your-user-profile-page-private')
         = f.gitlab_ui_checkbox_component :private_profile, '%{private_profile_label} %{private_profile_help_link}'.html_safe % { private_profile_label: private_profile_label, private_profile_help_link: private_profile_help_link.html_safe }
       %fieldset.form-group.gl-form-group
@@ -166,7 +162,7 @@
           = s_("Profiles|Private contributions")
         = f.gitlab_ui_checkbox_component :include_private_contributions,
           s_('Profiles|Include private contributions on my profile'),
-          help_text: s_("Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information")
+          help_text: s_("Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information.")
   %hr
   = f.submit s_("Profiles|Update profile settings"), class: 'gl-button btn btn-confirm gl-mr-3 js-password-prompt-btn'
   = link_to _("Cancel"), user_path(current_user), class: 'gl-button btn btn-default btn-cancel'
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml
index 845baae3bb2..6304d42896d 100644
--- a/app/views/profiles/two_factor_auths/show.html.haml
+++ b/app/views/profiles/two_factor_auths/show.html.haml
@@ -78,7 +78,7 @@
     .col-lg-8
       - registration = webauthn_enabled ? @webauthn_registration : @u2f_registration
       - if registration.errors.present?
-        = form_errors(registration)
+        = form_errors(registration, pajamas_alert: true)
       - if webauthn_enabled
         = render "authentication/register", target_path: create_webauthn_profile_two_factor_auth_path
       - else