diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-16 18:14:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-16 18:14:18 +0300 |
| commit | acee9d6fb529ca8fb91b2b07bd49bd207df23c51 (patch) | |
| tree | ac718adbbcb6078e403a20dd8f9258fee4d48dbc /app/views/notify | |
| parent | 77ded523f119396c72e4bcbcd008ff6b84134ef4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/service_desk_verification_result_email.html.haml | 5 | ||||
| -rw-r--r-- | app/views/notify/service_desk_verification_result_email.text.erb | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/views/notify/service_desk_verification_result_email.html.haml b/app/views/notify/service_desk_verification_result_email.html.haml index c072744c43c..faf8ae2e28c 100644 --- a/app/views/notify/service_desk_verification_result_email.html.haml +++ b/app/views/notify/service_desk_verification_result_email.html.haml @@ -54,5 +54,10 @@ %b = s_('Notify|Incorrect verification token:') = s_('Notify|We could not verify that we received the email we sent to your email inbox.') + - if @verification.read_timeout? + %p + %b + = s_('Notify|Read timeout:') + = s_('Notify|The SMTP server did not respond in time.') %p = html_escape(s_('Notify|To restart the verification process, go to your %{settings_link_start}project\'s Service Desk settings page%{settings_link_end}.')) % { settings_link_start: settings_link_start, settings_link_end: settings_link_end } diff --git a/app/views/notify/service_desk_verification_result_email.text.erb b/app/views/notify/service_desk_verification_result_email.text.erb index 65b0cba5616..fd2e4446d0b 100644 --- a/app/views/notify/service_desk_verification_result_email.text.erb +++ b/app/views/notify/service_desk_verification_result_email.text.erb @@ -32,6 +32,9 @@ <% elsif @verification.incorrect_token? %> <%= s_('Notify|Incorrect verification token:') %> <%= s_('Notify|We could not verify that we received the email we sent to your email inbox.') %> + <% elsif @verification.read_timeout? %> + <%= s_('Notify|Read timeout:') %> + <%= s_('Notify|The SMTP server did not respond in time.') %> <% end %> <%= s_('Notify|To restart the verification process, go to your %{settings_link_start}project\'s Service Desk settings page%{settings_link_end}.') % { settings_link_start: '', settings_link_end: '' } %> |