summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-06-12 11:36:29 +0100
committerSean McGivern <sean@gitlab.com>2018-06-18 12:22:05 +0100
commit899a0ef7fe8bec171b14f7864ab7e40e9a400fc5 (patch)
treeb783bf6ad50f96c6a0f1ad6c7ba058f49648d1b9 /app
parent0dd85546b2f933acf1b3d3d90871ab099d9bf929 (diff)
downloadgitlab-ce-899a0ef7fe8bec171b14f7864ab7e40e9a400fc5.tar.gz
Remove EE-specific code from rejection mailer
Diffstat (limited to 'app')
-rw-r--r--app/views/email_rejection_mailer/rejection.html.haml1
-rw-r--r--app/views/email_rejection_mailer/rejection.text.haml1
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/email_rejection_mailer/rejection.html.haml b/app/views/email_rejection_mailer/rejection.html.haml
index 7f7d841fe21..c4ae7befe4e 100644
--- a/app/views/email_rejection_mailer/rejection.html.haml
+++ b/app/views/email_rejection_mailer/rejection.html.haml
@@ -2,3 +2,4 @@
Unfortunately, your email message to GitLab could not be processed.
= markdown @reason
+= render_if_exists 'shared/additional_email_text'
diff --git a/app/views/email_rejection_mailer/rejection.text.haml b/app/views/email_rejection_mailer/rejection.text.haml
index af518b5b583..0e13b2a6473 100644
--- a/app/views/email_rejection_mailer/rejection.text.haml
+++ b/app/views/email_rejection_mailer/rejection.text.haml
@@ -1,3 +1,4 @@
Unfortunately, your email message to GitLab could not be processed.
\
= @reason
+= render_if_exists 'shared/additional_email_text'