diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-04-04 12:11:55 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-04-04 12:29:03 -0500 |
| commit | a6c7d8050eb6eeb0373f69a3f99c7f7b64f77e07 (patch) | |
| tree | f652425e0aaf3c20d2788e21683492528fd5bb58 /app | |
| parent | 1be9f587351639a359416e915a25faf7280b65e9 (diff) | |
| download | gitlab-ce-a6c7d8050eb6eeb0373f69a3f99c7f7b64f77e07.tar.gz | |
Add custom additonal email text to all emailsce-4474-custom-additional-text-in-confirmation-email
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/email_rejection_mailer/rejection.text.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/email_rejection_mailer/rejection.text.haml b/app/views/email_rejection_mailer/rejection.text.haml index 6693e6f90e8..af518b5b583 100644 --- a/app/views/email_rejection_mailer/rejection.text.haml +++ b/app/views/email_rejection_mailer/rejection.text.haml @@ -1,4 +1,3 @@ Unfortunately, your email message to GitLab could not be processed. - - +\ = @reason |