Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

5 files changed, 44 insertions, 32 deletions

diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml
index 69f765ee163..ef9e7512b57 100644
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
@@ -18,7 +18,7 @@
         = f.submit _('Add email address'), class: 'gl-button btn btn-confirm', data: { qa_selector: 'add_email_address_button' }
     %hr
     %h4.gl-mt-0
-      = _('Linked emails (%{email_count})') % { email_count: @emails.load.size + 1 }
+      = _('Linked emails (%{email_count})') % { email_count: @emails.load.size }
     .account-well.gl-mb-3
       %ul
         %li
@@ -36,28 +36,31 @@
     %ul.content-list
       %li
         = render partial: 'shared/email_with_badge', locals: { email: @primary_email, verified: current_user.confirmed? }
-        %span.float-right
-          = gl_badge_tag s_('Profiles|Primary email'), variant: :success
+        %ul
+          %li= s_('Profiles|Primary email')
           - if @primary_email === current_user.commit_email_or_default
-            = gl_badge_tag s_('Profiles|Commit email'), variant: :info
+            %li= s_('Profiles|Commit email')
           - if @primary_email === current_user.public_email
-            = gl_badge_tag s_('Profiles|Public email'), variant: :info
+            %li= s_('Profiles|Public email')
           - if @primary_email === current_user.notification_email_or_default
-            = gl_badge_tag s_('Profiles|Default notification email'), variant: :info
+            %li= s_('Profiles|Default notification email')
       - @emails.reject(&:user_primary_email?).each do |email|
         %li{ data: { qa_selector: 'email_row_content' } }
-          = render partial: 'shared/email_with_badge', locals: { email: email.email, verified: email.confirmed? }
-          %span.float-right
+          .gl-display-flex.gl-justify-content-space-between{ style: 'flex-flow: wrap-reverse; row-gap: 0.5rem' }
+            %div
+              = render partial: 'shared/email_with_badge', locals: { email: email.email, verified: email.confirmed? }
+            .gl-ml-n3
+              - unless email.confirmed?
+                - confirm_title = "#{email.confirmation_sent_at ? _('Resend confirmation email') : _('Send confirmation email')}"
+                = link_to confirm_title, resend_confirmation_instructions_profile_email_path(email), method: :put, class: 'gl-button btn btn-sm btn-default gl-ml-3'
+
+              = link_to profile_email_path(email), data: { confirm: _('Are you sure?'), qa_selector: 'delete_email_link'}, method: :delete, class: 'gl-button btn btn-sm btn-danger gl-ml-3' do
+                %span.sr-only= _('Remove')
+                = sprite_icon('remove')
+          %ul
             - if email.email === current_user.commit_email_or_default
-              = gl_badge_tag s_('Profiles|Commit email'), variant: :info
+              %li= s_('Profiles|Commit email')
             - if email.email === current_user.public_email
-              = gl_badge_tag s_('Profiles|Public email'), variant: :info
+              %li= s_('Profiles|Public email')
             - if email.email === current_user.notification_email_or_default
-              = gl_badge_tag s_('Profiles|Notification email'), variant: :info
-            - unless email.confirmed?
-              - confirm_title = "#{email.confirmation_sent_at ? _('Resend confirmation email') : _('Send confirmation email')}"
-              = link_to confirm_title, resend_confirmation_instructions_profile_email_path(email), method: :put, class: 'gl-button btn btn-sm btn-default gl-ml-3'
-
-            = link_to profile_email_path(email), data: { confirm: _('Are you sure?'), qa_selector: 'delete_email_link'}, method: :delete, class: 'gl-button btn btn-sm btn-danger gl-ml-3' do
-              %span.sr-only= _('Remove')
-              = sprite_icon('remove')
+              %li= s_('Profiles|Notification email')
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index 5c8acc053f4..35bf7d81502 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -7,6 +7,12 @@
       = page_title
     %p
       = _('SSH keys allow you to establish a secure connection between your computer and GitLab.')
+    %br
+    %h4.gl-mt-0
+      = _('SSH Fingerprints')
+    %p
+      - config_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_instance_configuration_url }
+      = html_escape(s_('SSH fingerprints verify that the client is connecting to the correct host. Check the %{config_link_start}current instance configuration%{config_link_end}.')) % { config_link_start: config_link_start, config_link_end: '</a>'.html_safe }
   .col-lg-8
     %h5.gl-mt-0
       = _('Add an SSH key')
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index a63e02fca1d..f8737a4e54a 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -99,7 +99,7 @@
           s_("Preferences|Show one file at a time on merge request's Changes tab"),
           help_text: s_("Preferences|Instead of all the files changed, show only one file at a time. To switch between files, use the file browser.")
       .form-group
-        - supported_characters = %w(" ' ` &#40; [ { < * _).map {|char| "<code>#{char}</code>" }.join(', ')
+        - supported_characters = %w(" ' ` &#40; [ { < * _).map { |char| "<code>#{char}</code>" }.join(', ')
         = f.gitlab_ui_checkbox_component :markdown_surround_selection,
           s_('Preferences|Surround text selection when typing quotes or brackets'),
           help_text: sprintf(s_( "Preferences|When you type in a description or comment box, selected text is surrounded by the corresponding character after typing one of the following characters: %{supported_characters}."), { supported_characters: supported_characters }).html_safe
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index dda1640968e..a64968cdcbb 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -3,7 +3,7 @@
 - @content_class = "limit-container-width" unless fluid_layout
 - gravatar_link = link_to Gitlab.config.gravatar.host, 'https://' + Gitlab.config.gravatar.host
 - availability = availability_values
-- custom_emoji = show_status_emoji?(@user.status)
+- custom_emoji = @user.status&.customized?
 
 = 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
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml
index 6304d42896d..c1eaa84e99d 100644
--- a/app/views/profiles/two_factor_auths/show.html.haml
+++ b/app/views/profiles/two_factor_auths/show.html.haml
@@ -21,24 +21,27 @@
 
       - else
         %p
-          - register_2fa_token = _('We recommend cloud-based mobile authenticator apps such as Authy, Duo Mobile, and LastPass. They can restore access if you lose your hardware device.')
+          - register_2fa_token = _('We recommend using cloud-based authenticator applications that can restore access if you lose your hardware device.')
           = register_2fa_token.html_safe
+          = link_to _('What are some examples?'), help_page_path('user/profile/account/two_factor_authentication', anchor: 'enable-one-time-password'), target: '_blank', rel: 'noopener noreferrer'
         .row.gl-mb-3
           .col-md-4.gl-min-w-fit-content
             .gl-p-2.gl-mb-3{ style: 'background: #fff' }
               = raw @qr_code
           .col-md-8
-            .account-well
-              %p.gl-mt-0.gl-mb-0
-                = _("Can't scan the code?")
-              %p.gl-mt-0.gl-mb-0
-                = _('To add the entry manually, provide the following details to the application on your phone.')
-              %p.gl-mt-0.gl-mb-0
-                = _('Account: %{account}') % { account: @account_string }
-              %p.gl-mt-0.gl-mb-0.two-factor-secret{ data: { qa_selector: 'otp_secret_content' } }
-                = _('Key: %{key}') %{ key: current_user.otp_secret.scan(/.{4}/).join(' ') }
-              %p.two-factor-new-manual-content
-                = _('Time based: Yes')
+            .gl-card
+              .gl-card-body
+                %p.gl-mt-0.gl-mb-3.gl-font-weight-bold
+                  = _("Can't scan the code?")
+                %p.gl-mt-0.gl-mb-3
+                  = _('To add the entry manually, provide the following details to the application on your phone.')
+                %p.gl-mt-0.gl-mb-0
+                  = _('Account: %{account}') % { account: @account_string }
+                %p.gl-mt-0.gl-mb-0{ data: { qa_selector: 'otp_secret_content' } }
+                  = _('Key:')
+                  %code.two-factor-secret= current_user.otp_secret.scan(/.{4}/).join(' ')
+                %p.gl-mb-0.two-factor-new-manual-content
+                  = _('Time based: Yes')
         = form_tag profile_two_factor_auth_path, method: :post do |f|
           - if @error
             = render Pajamas::AlertComponent.new(title: @error[:message],