gitlab-org--gitlab-foss/app/views/email_rejection_mailer/rejection.text.haml

= _("Unfortunately, your email message to GitLab could not be processed.")
\
= @reason
= render_if_exists 'shared/additional_email_text'
Externalize strings from `/app/views/email_rejection_mailer` 2019-02-01 14:52:38 +00:00			`= _("Unfortunately, your email message to GitLab could not be processed.")`
Add custom additonal email text to all emails Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474 Conflicts: db/schema.rb ee/app/controllers/ee/admin/application_settings_controller.rb ee/app/helpers/ee/application_settings_helper.rb ee/app/models/ee/application_setting.rb ee/app/models/license.rb ee/app/views/layouts/service_desk.html.haml ee/app/views/notify/approved_merge_request_email.html.haml ee/app/views/notify/service_desk_new_note_email.text.erb ee/app/views/notify/service_desk_thank_you_email.text.erb ee/app/views/notify/unapproved_merge_request_email.html.haml ee/lib/ee/api/entities.rb ee/spec/controllers/admin/application_settings_controller_spec.rb ee/spec/models/application_setting_spec.rb ee/spec/requests/api/settings_spec.rb lib/api/settings.rb spec/mailers/previews/notify_preview.rb 2018-04-04 17:11:55 +00:00			`\`
Send a rejection email when the incoming email couldn't be processed. 2015-08-19 18:10:21 +00:00			`= @reason`
Remove EE-specific code from rejection mailer 2018-06-12 10:36:29 +00:00			`= render_if_exists 'shared/additional_email_text'`