diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-04 03:08:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-04 03:08:51 +0300 |
| commit | 95a64386228fc12340beb33fa2f511930e83e6be (patch) | |
| tree | 351089a9a05a012384180be9ccdc6668b6aeac8a /app/views/notify | |
| parent | 425c89a0081b218f50227c4e3d8ffbfb420b2850 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/resource_access_tokens_about_to_expire_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/resource_access_tokens_about_to_expire_email.text.erb | 2 |
2 files changed, 4 insertions, 0 deletions
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 = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.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: '</a>'.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 %> |