Merge branch 'trojkilla-master-patch-92474' into 'master'

Update Unknown signin email timestamp - 24 hour time

See merge request gitlab-org/gitlab!47748

app/views/notify/unknown_sign_in_email.html.haml

@@ -32,7 +32,7 @@
           %td{ style: "#{default_style}border-top:1px solid #ededed;" }
             = _('Time')
           %td{ style: "#{default_style}color:#333333;font-weight:400;width:75%;padding-left:5px;border-top:1px solid #ededed;" }
-            = @time.strftime('%Y-%m-%d %l:%M:%S %p %Z')
+            = @time.strftime('%Y-%m-%d %k:%M:%S %Z')
 %tr.spacer
   %td{ style: spacer_style }
      

doc/user/profile/unknown_sign_in_notification.md

@@ -30,4 +30,4 @@ for a notification email to be sent.
 
 ## Example email
 
-![Unknown sign in email](img/unknown_sign_in_email_v13_1.png)
+![Unknown sign in email](img/unknown_sign_in_email_v14_0.png)

spec/mailers/emails/profile_spec.rb

@@ -337,7 +337,7 @@ RSpec.describe Emails::Profile do
     end
 
     it 'mentioned the time' do
-      is_expected.to have_body_text current_time.strftime('%Y-%m-%d %l:%M:%S %p %Z')
+      is_expected.to have_body_text current_time.strftime('%Y-%m-%d %k:%M:%S %Z')
     end
 
     it 'includes a link to the change password documentation' do