From 95a64386228fc12340beb33fa2f511930e83e6be Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 4 Oct 2023 00:08:51 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/notify/resource_access_tokens_about_to_expire_email.html.haml | 2 ++ app/views/notify/resource_access_tokens_about_to_expire_email.text.erb | 2 ++ 2 files changed, 4 insertions(+) (limited to 'app/views/notify') diff --git a/app/views/notify/resource_access_tokens_about_to_expire_email.html.haml b/app/views/notify/resource_access_tokens_about_to_expire_email.html.haml index e4e34f6c8ee..35c2260f24f 100644 --- a/app/views/notify/resource_access_tokens_about_to_expire_email.html.haml +++ b/app/views/notify/resource_access_tokens_about_to_expire_email.html.haml @@ -11,3 +11,5 @@ %p - link_start = ''.html_safe % { url: @target_url } = html_escape(_('You can create a new one or check them in your %{link_start}access tokens%{link_end} settings.')) % { link_start: link_start, link_end: ''.html_safe } +%p + = @reason_text diff --git a/app/views/notify/resource_access_tokens_about_to_expire_email.text.erb b/app/views/notify/resource_access_tokens_about_to_expire_email.text.erb index bea74f09129..f57c3e7b0d0 100644 --- a/app/views/notify/resource_access_tokens_about_to_expire_email.text.erb +++ b/app/views/notify/resource_access_tokens_about_to_expire_email.text.erb @@ -9,3 +9,5 @@ <% end %> <%= _('You can create a new one or check them in your access token settings: %{target_url}') % { target_url: @target_url } %> + +<%= @reason_text %> -- cgit v1.2.3