Commit 33a0edc8 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'unknown-signin-time-format-H' into 'master'

change unknown signin time hour to %H format

See merge request gitlab-org/gitlab!62944
parents ec2587c6 38096293
......@@ -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 %k:%M:%S %Z')
= @time.strftime('%Y-%m-%d %H:%M:%S %Z')
%tr.spacer
%td{ style: spacer_style }
 
......
......@@ -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 %k:%M:%S %Z')
is_expected.to have_body_text current_time.strftime('%Y-%m-%d %H:%M:%S %Z')
end
it 'includes a link to the change password documentation' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment