diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-24 18:12:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-24 18:12:40 +0300 |
| commit | 92849dc177d5e0d11f89b4ca75f4e3e45ad6341b (patch) | |
| tree | 6dd67ad9b1edc1ca2ded39077c041ffdd0ea38e0 /app/views/notify | |
| parent | 83ffdf48518e121c1ccab9d7913d3f7e79d7766c (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 | 2 | ||||
| -rw-r--r-- | app/views/notify/service_desk_verification_result_email.text.erb | 2 |
2 files changed, 2 insertions, 2 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 faf8ae2e28c..651f94533ec 100644 --- a/app/views/notify/service_desk_verification_result_email.html.haml +++ b/app/views/notify/service_desk_verification_result_email.html.haml @@ -35,7 +35,7 @@ %p %b = s_('Notify|Invalid credentials:') - = s_('Notify|The given credentials (username and password) were rejected by the SMTP server.') + = s_('Notify|The given credentials (username and password) were rejected by the SMTP server, or you need to explicitly set an authentication method.') - if @verification.mail_not_received_within_timeframe? %p %b 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 fd2e4446d0b..134b6592197 100644 --- a/app/views/notify/service_desk_verification_result_email.text.erb +++ b/app/views/notify/service_desk_verification_result_email.text.erb @@ -18,7 +18,7 @@ <%= s_('Notify|We were not able to make a connection to the specified host or there was an SSL issue.') %> <% elsif @verification.invalid_credentials? %> <%= s_('Notify|Invalid credentials:') %> - <%= s_('Notify|The given credentials (username and password) were rejected by the SMTP server.') %> + <%= s_('Notify|The given credentials (username and password) were rejected by the SMTP server, or you need to explicitly set an authentication method.') %> <% elsif @verification.mail_not_received_within_timeframe? %> <%= s_('Notify|Verification email not received within timeframe:') %> <%= s_('Notify|We did not receive the verification email we sent out to %{strong_open}%{email_address}%{strong_close} in time.') % { email_address: verify_email_address, strong_open: '', strong_close: '' } %> |