diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/views/notify | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/views/notify')
11 files changed, 48 insertions, 5 deletions
diff --git a/app/views/notify/access_token_about_to_expire_email.html.haml b/app/views/notify/access_token_about_to_expire_email.html.haml index ea27f72764f..fc318de4c42 100644 --- a/app/views/notify/access_token_about_to_expire_email.html.haml +++ b/app/views/notify/access_token_about_to_expire_email.html.haml @@ -8,4 +8,4 @@ %li= token %p - pat_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 %{pat_link_start}personal access tokens%{pat_link_end} settings')) % { pat_link_start: pat_link_start, pat_link_end: '</a>'.html_safe } + = html_escape(_('You can create a new one or check them in your %{pat_link_start}personal access tokens%{pat_link_end} settings.')) % { pat_link_start: pat_link_start, pat_link_end: '</a>'.html_safe } diff --git a/app/views/notify/access_token_about_to_expire_email.text.erb b/app/views/notify/access_token_about_to_expire_email.text.erb index dc9b1379e47..39608f0d6bd 100644 --- a/app/views/notify/access_token_about_to_expire_email.text.erb +++ b/app/views/notify/access_token_about_to_expire_email.text.erb @@ -6,4 +6,4 @@ - <%= token %> <% end %> -<%= _('You can create a new one or check them in your personal access tokens settings %{pat_link}') % { pat_link: @target_url } %> +<%= _('You can create a new one or check them in your personal access tokens settings %{pat_link}.') % { pat_link: @target_url } %> diff --git a/app/views/notify/access_token_expired_email.html.haml b/app/views/notify/access_token_expired_email.html.haml index b26431cce91..1e7c07c2282 100644 --- a/app/views/notify/access_token_expired_email.html.haml +++ b/app/views/notify/access_token_expired_email.html.haml @@ -4,4 +4,4 @@ = _('One or more of your personal access tokens has expired.') %p - pat_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 %{pat_link_start}personal access tokens%{pat_link_end} settings')) % { pat_link_start: pat_link_start, pat_link_end: '</a>'.html_safe } + = html_escape(_('You can create a new one or check them in your %{pat_link_start}personal access tokens%{pat_link_end} settings.')) % { pat_link_start: pat_link_start, pat_link_end: '</a>'.html_safe } diff --git a/app/views/notify/access_token_expired_email.text.erb b/app/views/notify/access_token_expired_email.text.erb index d44f993d094..4dc67e85dc2 100644 --- a/app/views/notify/access_token_expired_email.text.erb +++ b/app/views/notify/access_token_expired_email.text.erb @@ -2,4 +2,4 @@ <%= _('One or more of your personal access tokens has expired.') %> -<%= _('You can create a new one or check them in your personal access tokens settings %{pat_link}') % { pat_link: @target_url } %> +<%= _('You can create a new one or check them in your personal access tokens settings %{pat_link}.') % { pat_link: @target_url } %> diff --git a/app/views/notify/in_product_marketing_email.html.haml b/app/views/notify/in_product_marketing_email.html.haml index 45b002757e3..6382718480f 100644 --- a/app/views/notify/in_product_marketing_email.html.haml +++ b/app/views/notify/in_product_marketing_email.html.haml @@ -3,7 +3,7 @@ %head %meta{ content: "text/html; charset=utf-8", "http-equiv" => "Content-Type" } %meta{ content: "width=device-width, initial-scale=1", name: "viewport" } - %link{ href: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600", rel: "stylesheet", type: "text/css" } + %link{ href: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600", rel: "stylesheet", type: "text/css", data: { premailer: 'ignore' } } %title= message.subject :css /* CLIENT-SPECIFIC STYLES */ diff --git a/app/views/notify/send_admin_notification.html.haml b/app/views/notify/send_admin_notification.html.haml new file mode 100644 index 00000000000..f7f1528f332 --- /dev/null +++ b/app/views/notify/send_admin_notification.html.haml @@ -0,0 +1,7 @@ += simple_format @body + +\---- + +%p + Don't want to receive updates from GitLab administrators? + = link_to 'Unsubscribe', @unsubscribe_url diff --git a/app/views/notify/send_admin_notification.text.haml b/app/views/notify/send_admin_notification.text.haml new file mode 100644 index 00000000000..bfacbd3dcb2 --- /dev/null +++ b/app/views/notify/send_admin_notification.text.haml @@ -0,0 +1,6 @@ += h @body + +\----- + +Don't want to receive updates from GitLab administrators? +Unsubscribe here: #{@unsubscribe_url} diff --git a/app/views/notify/send_unsubscribed_notification.html.haml b/app/views/notify/send_unsubscribed_notification.html.haml new file mode 100644 index 00000000000..9f68feeaa31 --- /dev/null +++ b/app/views/notify/send_unsubscribed_notification.html.haml @@ -0,0 +1,2 @@ +%p + You have been unsubscribed from receiving GitLab administrator notifications. diff --git a/app/views/notify/send_unsubscribed_notification.text.haml b/app/views/notify/send_unsubscribed_notification.text.haml new file mode 100644 index 00000000000..5edc1ddcdae --- /dev/null +++ b/app/views/notify/send_unsubscribed_notification.text.haml @@ -0,0 +1 @@ +You have been unsubscribed from receiving GitLab administrator notifications. diff --git a/app/views/notify/user_deactivated_email.html.haml b/app/views/notify/user_deactivated_email.html.haml new file mode 100644 index 00000000000..a9262cab219 --- /dev/null +++ b/app/views/notify/user_deactivated_email.html.haml @@ -0,0 +1,17 @@ += email_default_heading(_('Hello %{name},') % { name: @name }) +%p + = _('Your account has been deactivated. You will not be able to: ') +%ul + %li + = _('Access Git repositories or the API.') + %li + = _('Receive any notifications from GitLab.') + %li + = _('Use slash commands.') +%p + - gitlab_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: root_url } + - link_end = '</a>'.html_safe + = _('To reactivate your account, %{gitlab_link_start}sign in to GitLab.%{link_end}').html_safe % { gitlab_link_start: gitlab_link_start, link_end: link_end} + +%p + = _('Please contact your GitLab administrator if you think this is an error.') diff --git a/app/views/notify/user_deactivated_email.text.erb b/app/views/notify/user_deactivated_email.text.erb new file mode 100644 index 00000000000..9e7d00f4ad1 --- /dev/null +++ b/app/views/notify/user_deactivated_email.text.erb @@ -0,0 +1,10 @@ +<%= _('Hello %{name},') % { name: @name } %> + +<%= _('Your account has been deactivated. You will not be able to: ') %> + - <%= _('Access Git repositories or the API.') %> + - <%= _('Receive any notifications from GitLab.') %> + - <%= _('Use slash commands.') %> + +<%= _('To reactivate your account, sign in to GitLab at %{gitlab_url}.') % { gitlab_url: root_url } %> + +<%= _('Please contact your GitLab administrator if you think this is an error.') %> |