Commit graph

9 commits

Author SHA1 Message Date
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
Eric Eastwood
dc45cc5411 Fix unapproved unassigned MR email erroring out
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/3092

Conflicts:
	ee/app/views/notify/unapproved_merge_request_email.html.haml
	spec/mailers/notify_spec.rb
2018-03-28 10:34:12 -05:00
Luke "Jared" Bennett
9cee280d70
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion 2017-04-06 13:47:52 +01:00
Toon Claes
4bc70127e4 Make it possible to preview pipeline success/failed emails
Visit `/rails/mailers/notify` on your local running GitLab instance to
show a preview pipeline success emails.
2017-04-06 07:07:54 +02:00
Douwe Maan
3ff708f723
Remove unused code 2017-04-05 17:44:14 +01:00
Douwe Maan
c319f21141
Address review comments 2017-04-05 17:44:14 +01:00
Robert Speicher
7b66dcf65e Add previews for all customized Devise emails 2016-06-16 20:10:52 -04:00
Robert Speicher
3e3463218d New confirmation email 🔥 2016-05-25 16:56:06 -04:00
Robert Speicher
2682c58847 Customize ActionMailer preview path 2016-05-25 16:56:06 -04:00