diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-24 12:10:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-24 12:10:04 +0300 |
| commit | fd7c75bf603f4f2f1a4a4e63ef5cbc1a51cc0a15 (patch) | |
| tree | 563fffedae3133a872e1005f846aa6686a84872f /app/views | |
| parent | 02f08e9e78740f65b63268467caa67b9e4b2409f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
4 files changed, 23 insertions, 0 deletions
diff --git a/app/views/devise/mailer/email_changed_gitlab_com.html.haml b/app/views/devise/mailer/email_changed_gitlab_com.html.haml new file mode 100644 index 00000000000..de91418860d --- /dev/null +++ b/app/views/devise/mailer/email_changed_gitlab_com.html.haml @@ -0,0 +1,11 @@ += email_default_heading("Hello, #{@resource.name}!") + +- if @resource.try(:unconfirmed_email?) + %p + We're contacting you to notify you that your email is being changed to #{@resource.reset.unconfirmed_email}. +- else + %p + We're contacting you to notify you that your email has been changed to #{@resource.email}. + +%p + If you did not initiate this change, please contact your group owner immediately. If you have a Premium or Ultimate tier subscription, you can also contact GitLab support. diff --git a/app/views/devise/mailer/email_changed_gitlab_com.text.erb b/app/views/devise/mailer/email_changed_gitlab_com.text.erb new file mode 100644 index 00000000000..c978d666180 --- /dev/null +++ b/app/views/devise/mailer/email_changed_gitlab_com.text.erb @@ -0,0 +1,9 @@ +Hello, <%= @resource.name %>! + +<% if @resource.try(:unconfirmed_email?) %> +We're contacting you to notify you that your email is being changed to <%= @resource.reset.unconfirmed_email %>. +<% else %> +We're contacting you to notify you that your email has been changed to <%= @resource.email %>. +<% end %> + +If you did not initiate this change, please contact your group owner immediately. If you have a Premium or Ultimate tier subscription, you can also contact GitLab support. diff --git a/app/views/notify/new_review_email.html.haml b/app/views/notify/new_review_email.html.haml index afc1bd68215..8a184aa9696 100644 --- a/app/views/notify/new_review_email.html.haml +++ b/app/views/notify/new_review_email.html.haml @@ -22,3 +22,4 @@ - discussion.first_note.project = @project if discussion&.first_note - target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{note.id}") = render 'note_email', note: note, diff_limit: 3, target_url: target_url, note_style: "border-bottom:1px solid #ededed; padding-bottom: 1em;", include_stylesheet_link: false, discussion: discussion, author: @author + = render_if_exists 'notify/review_summary' diff --git a/app/views/notify/new_review_email.text.erb b/app/views/notify/new_review_email.text.erb index 69cb33b05df..e974c8b6be8 100644 --- a/app/views/notify/new_review_email.text.erb +++ b/app/views/notify/new_review_email.text.erb @@ -12,3 +12,5 @@ -- <% end %> <% end %> + +<%= render_if_exists 'notify/review_summary' %> |