Commit graph

6 commits

Author SHA1 Message Date
GitLab Bot
71221554dd Add latest changes from gitlab-org/gitlab@master 2019-12-04 21:07:31 +00:00
Luke Bennett
974e71a9c5
Resolve CE/EE diffs in app/views/layouts view
Part of single codebase changes.
2019-05-11 23:38:41 +01:00
Alexandru Croitor
77985826d9 Show header and footer system messages in email
* Add email_header_and_footer_enabled flag to appearances table
* Set email_header_and_footer_enabled default value to false
* Add checkbox to appearance to toggle show header and footer in emails
* Add email_header_and_footer_enabled to allowed params in controller
* Add header and footer messages to the html and text email layouts
* Remove the color styling for emails header and footer
* Add empty_mailer layout for emails without layout,
to have the header and footer applied
2019-02-27 22:07:50 +02:00
Enrico Scholz
931f6e6d5c set proper signature marker in mails
use rfc 3676 mail signature delimiters ("-- ") instead of the previous
"---" one.

closes #43617

Signed-off-by: Enrico Scholz <enrico.scholz@ensc.de>
2018-04-18 11:50:07 +02:00
Mario de la Ossa
23a20c20f8
Initial work to add notification reason to emails
Adds `#build_notification_recipients` to `NotificationRecipientService`
that returns the `NotificationRecipient` objects in order to be able to
access the new attribute `reason`.

This new attribute is used in the different notifier methods in order to
add the reason as a header: `X-GitLab-NotificationReason`.

Only the reason with the most priority gets sent.
2018-01-16 19:17:55 -06:00
Douwe Maan
f6f6aaf593
Better notification emails for notes and (diff) discussions 2017-04-05 17:44:14 +01:00