Commit graph

5 commits

Author SHA1 Message Date
Sean McGivern
899a0ef7fe Remove EE-specific code from rejection mailer 2018-06-18 12:22:05 +01:00
Eric Eastwood
a6c7d8050e 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 12:29:03 -05:00
Douwe Maan
4e33127b3a We'll get the <p> for free. 2015-08-19 12:38:08 -07:00
Douwe Maan
ed6122d7ea Markdown, not GFM. 2015-08-19 12:37:34 -07:00
Douwe Maan
76dbafba86 Send a rejection email when the incoming email couldn't be processed. 2015-08-19 11:10:21 -07:00