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
da09c17f
Commit
da09c17f
authored
May 27, 2021
by
Dan Jensen
Committed by
Olena Horal-Koretska
May 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve SSH key expiration warning emails
parent
296c947e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
7 deletions
+7
-7
app/views/notify/ssh_key_expired_email.html.haml
app/views/notify/ssh_key_expired_email.html.haml
+1
-1
app/views/notify/ssh_key_expired_email.text.erb
app/views/notify/ssh_key_expired_email.text.erb
+1
-1
app/views/notify/ssh_key_expiring_soon.text.erb
app/views/notify/ssh_key_expiring_soon.text.erb
+1
-1
app/views/notify/ssh_key_expiring_soon_email.html.haml
app/views/notify/ssh_key_expiring_soon_email.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+2
-2
spec/mailers/emails/profile_spec.rb
spec/mailers/emails/profile_spec.rb
+1
-1
No files found.
app/views/notify/ssh_key_expired_email.html.haml
View file @
da09c17f
%p
%p
=
_
(
'Hi %{username}!'
)
%
{
username:
sanitize_name
(
@user
.
name
)
}
=
_
(
'Hi %{username}!'
)
%
{
username:
sanitize_name
(
@user
.
name
)
}
%p
%p
=
_
(
'Your SSH keys with the following fingerprints ha
s expired
:'
)
=
_
(
'Your SSH keys with the following fingerprints ha
ve expired. Expired SSH keys will not be usable in future versions of GitLab
:'
)
%table
%table
%tbody
%tbody
-
@fingerprints
.
each
do
|
fingerprint
|
-
@fingerprints
.
each
do
|
fingerprint
|
...
...
app/views/notify/ssh_key_expired_email.text.erb
View file @
da09c17f
<%=
_
(
'Hi %{username}!'
)
%
{
username:
sanitize_name
(
@user
.
name
)
}
%>
<%=
_
(
'Hi %{username}!'
)
%
{
username:
sanitize_name
(
@user
.
name
)
}
%>
<%=
_
(
'Your SSH keys with the following fingerprints ha
s expired
:'
)
%>
<%=
_
(
'Your SSH keys with the following fingerprints ha
ve expired. Expired SSH keys will not be usable in future versions of GitLab
:'
)
%>
<%
@fingerprints
.
each
do
|
fingerprint
|
%>
<%
@fingerprints
.
each
do
|
fingerprint
|
%>
-
<%=
fingerprint
%>
-
<%=
fingerprint
%>
...
...
app/views/notify/ssh_key_expiring_soon.text.erb
View file @
da09c17f
<%=
_
(
'Hi %{username}!'
)
%
{
username:
sanitize_name
(
@user
.
name
)
}
%>
<%=
_
(
'Hi %{username}!'
)
%
{
username:
sanitize_name
(
@user
.
name
)
}
%>
<%=
_
(
'Your SSH keys with the following fingerprints are scheduled to expire soon:'
)
%>
<%=
_
(
'Your SSH keys with the following fingerprints are scheduled to expire soon
. Expired SSH keys will not be usable in future versions of GitLab
:'
)
%>
<%
@fingerprints
.
each
do
|
fingerprint
|
%>
<%
@fingerprints
.
each
do
|
fingerprint
|
%>
-
<%=
fingerprint
%>
-
<%=
fingerprint
%>
...
...
app/views/notify/ssh_key_expiring_soon_email.html.haml
View file @
da09c17f
%p
%p
=
_
(
'Hi %{username}!'
)
%
{
username:
sanitize_name
(
@user
.
name
)
}
=
_
(
'Hi %{username}!'
)
%
{
username:
sanitize_name
(
@user
.
name
)
}
%p
%p
=
_
(
'Your SSH keys with the following fingerprints are scheduled to expire soon:'
)
=
_
(
'Your SSH keys with the following fingerprints are scheduled to expire soon
. Expired SSH keys will not be usable in future versions of GitLab
:'
)
%table
%table
%tbody
%tbody
-
@fingerprints
.
each
do
|
fingerprint
|
-
@fingerprints
.
each
do
|
fingerprint
|
...
...
locale/gitlab.pot
View file @
da09c17f
...
@@ -37741,10 +37741,10 @@ msgstr ""
...
@@ -37741,10 +37741,10 @@ msgstr ""
msgid "Your SSH keys (%{count})"
msgid "Your SSH keys (%{count})"
msgstr ""
msgstr ""
msgid "Your SSH keys with the following fingerprints are scheduled to expire soon:"
msgid "Your SSH keys with the following fingerprints are scheduled to expire soon
. Expired SSH keys will not be usable in future versions of GitLab
:"
msgstr ""
msgstr ""
msgid "Your SSH keys with the following fingerprints ha
s expired
:"
msgid "Your SSH keys with the following fingerprints ha
ve expired. Expired SSH keys will not be usable in future versions of GitLab
:"
msgstr ""
msgstr ""
msgid "Your To-Do List"
msgid "Your To-Do List"
...
...
spec/mailers/emails/profile_spec.rb
View file @
da09c17f
...
@@ -264,7 +264,7 @@ RSpec.describe Emails::Profile do
...
@@ -264,7 +264,7 @@ RSpec.describe Emails::Profile do
include_examples
'valid use case'
include_examples
'valid use case'
it_behaves_like
'has the correct subject'
,
/Your SSH key has expired/
it_behaves_like
'has the correct subject'
,
/Your SSH key has expired/
it_behaves_like
'has the correct body text'
,
/Your SSH keys with the following fingerprints ha
s
expired/
it_behaves_like
'has the correct body text'
,
/Your SSH keys with the following fingerprints ha
ve
expired/
end
end
context
'when invalid'
do
context
'when invalid'
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