diff options
Diffstat (limited to 'app/views/notify')
5 files changed, 27 insertions, 1 deletions
diff --git a/app/views/notify/issue_cloned_email.html.haml b/app/views/notify/issue_cloned_email.html.haml new file mode 100644 index 00000000000..a9e21e74e22 --- /dev/null +++ b/app/views/notify/issue_cloned_email.html.haml @@ -0,0 +1,7 @@ +- author_link = link_to @author.name, user_url(@author) +- if @can_access_project + - string = _("%{author_link} cloned %{original_issue} to %{new_issue}.").html_safe +- else + - string = _("%{author_link} cloned %{original_issue}. You don't have access to the new project.").html_safe +%p + = string % { author_link: author_link, original_issue: issue_reference_link(@issue), new_issue: issue_reference_link(@new_issue, full: true) } diff --git a/app/views/notify/issue_cloned_email.text.erb b/app/views/notify/issue_cloned_email.text.erb new file mode 100644 index 00000000000..8d3ff14df5a --- /dev/null +++ b/app/views/notify/issue_cloned_email.text.erb @@ -0,0 +1,8 @@ +Issue was cloned. + +<% if @can_access_project %> + New issue location: + <%= project_issue_url(@new_issue.project, @new_issue) %> +<% else %> + You don't have access to the project. +<% end %> diff --git a/app/views/notify/new_release_email.html.haml b/app/views/notify/new_release_email.html.haml index 45e99f3c07a..9cef4cd85cd 100644 --- a/app/views/notify/new_release_email.html.haml +++ b/app/views/notify/new_release_email.html.haml @@ -15,4 +15,4 @@ %p %h4= _("Release notes:") - = markdown_field(@release, :description) + = markdown(@release.description, pipeline: :email, author: @release.author) diff --git a/app/views/notify/user_admin_rejection_email.html.haml b/app/views/notify/user_admin_rejection_email.html.haml new file mode 100644 index 00000000000..24d6c05fa38 --- /dev/null +++ b/app/views/notify/user_admin_rejection_email.html.haml @@ -0,0 +1,5 @@ += email_default_heading(_('Hello %{name},') % { name: @name }) +%p + = _('Your request to join %{host} has been rejected.').html_safe % { host: link_to(root_url, root_url) } +%p + = _('Please contact your GitLab administrator if you think this is an error.') diff --git a/app/views/notify/user_admin_rejection_email.text.erb b/app/views/notify/user_admin_rejection_email.text.erb new file mode 100644 index 00000000000..cc676b82934 --- /dev/null +++ b/app/views/notify/user_admin_rejection_email.text.erb @@ -0,0 +1,6 @@ +<%= _('Hello %{name},') % { name: @name } %> + +<%= _('Your request to join %{host} has been rejected.') % { host: root_url } %> + +<%= _('Please contact your GitLab administrator if you think this is an error.') %> + |