Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
38096293
Commit
38096293
authored
Jun 01, 2021
by
trojkilla
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change unknown signin time hour to %H format
parent
f28ae91a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/notify/unknown_sign_in_email.html.haml
app/views/notify/unknown_sign_in_email.html.haml
+1
-1
spec/mailers/emails/profile_spec.rb
spec/mailers/emails/profile_spec.rb
+1
-1
No files found.
app/views/notify/unknown_sign_in_email.html.haml
View file @
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
}
...
...
spec/mailers/emails/profile_spec.rb
View file @
38096293
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment