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
cc0a6c56
Commit
cc0a6c56
authored
May 26, 2021
by
trojkilla
Committed by
Rémy Coutable
May 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Unknown signin email timestamp to use 24 hour time
Changelog: changed
parent
4872158f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/notify/unknown_sign_in_email.html.haml
app/views/notify/unknown_sign_in_email.html.haml
+1
-1
doc/user/profile/img/unknown_sign_in_email_v13_1.png
doc/user/profile/img/unknown_sign_in_email_v13_1.png
+0
-0
doc/user/profile/img/unknown_sign_in_email_v14_0.png
doc/user/profile/img/unknown_sign_in_email_v14_0.png
+0
-0
doc/user/profile/unknown_sign_in_notification.md
doc/user/profile/unknown_sign_in_notification.md
+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 @
cc0a6c56
...
...
@@ -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/img/unknown_sign_in_email_v13_1.png
deleted
100644 → 0
View file @
4872158f
19.8 KB
doc/user/profile/img/unknown_sign_in_email_v14_0.png
0 → 100644
View file @
cc0a6c56
67.3 KB
doc/user/profile/unknown_sign_in_notification.md
View file @
cc0a6c56
...
...
@@ -30,4 +30,4 @@ for a notification email to be sent.
## Example email
![
Unknown sign in email
](
img/unknown_sign_in_email_v1
3_1
.png
)
![
Unknown sign in email
](
img/unknown_sign_in_email_v1
4_0
.png
)
spec/mailers/emails/profile_spec.rb
View file @
cc0a6c56
...
...
@@ -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
...
...
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