diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 18:17:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 18:17:13 +0300 |
| commit | 4bdfcf93f224edb9c4daff90d95b0c6c92766ea3 (patch) | |
| tree | cedf1f94561571d00033c48846ad3959af64449b /app/views/notify | |
| parent | fb5d3cceb8d43f8c2dc22a5d8c74327e9397f2e8 (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 d63177e4a42..c072744c43c 100644 --- a/app/views/notify/service_desk_verification_result_email.html.haml +++ b/app/views/notify/service_desk_verification_result_email.html.haml @@ -14,7 +14,7 @@ %tr %td.text-content - - if @verification.verified? + - if @verification.finished? %h1{ :style => "margin-top:0;" } = s_("Notify|Email successfully verified") %p 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 a78e3b19d1e..65b0cba5616 100644 --- a/app/views/notify/service_desk_verification_result_email.text.erb +++ b/app/views/notify/service_desk_verification_result_email.text.erb @@ -2,7 +2,7 @@ <% email_address = @service_desk_setting.custom_email %> <% verify_email_address = @service_desk_setting.custom_email_address_for_verification %> -<% if @verification.verified? %> +<% if @verification.finished? %> <%= s_("Notify|Email successfully verified") %> <%= s_('Notify|Your email address %{strong_open}%{email_address}%{strong_close} for the Service Desk of %{project_link_start}%{project_name}%{project_link_end} was verified successfully.') % { email_address: email_address, project_link_start: '', project_name: project_name, project_link_end: '', strong_open: '', strong_close: '' } %> |