diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-27 00:10:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-27 00:10:49 +0300 |
| commit | 84d72a5660ac1f3c55026b8781152a9bcbe13fa2 (patch) | |
| tree | 34e4bbdcbb91f6c67f99f5f69b52be140f9c8763 /spec/mailers | |
| parent | 4c47bc5ec6420ab3a4ef629010e89de45b2776b9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/mailers')
| -rw-r--r-- | spec/mailers/emails/profile_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/mailers/emails/profile_spec.rb b/spec/mailers/emails/profile_spec.rb index 8ac1f15d67e..f6895cab30e 100644 --- a/spec/mailers/emails/profile_spec.rb +++ b/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 |