Commit graph

8 commits

Author SHA1 Message Date
GitLab Bot
0c85feba3d Add latest changes from gitlab-org/gitlab@master 2020-09-26 00:09:35 +00:00
GitLab Bot
e4ea43b2b8 Add latest changes from gitlab-org/gitlab@master 2020-01-27 21:08:47 +00: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
gfyoung
8184ce7fb7 Enable frozen in app/mailers/**/*.rb 2018-08-15 21:45:57 +00:00
Mario de la Ossa
eaada9d706 use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
Robert Speicher
01248d2051 Make AbuseReportMailer responsible for knowing if it should deliver 2016-01-04 18:59:25 -05:00
Douwe Maan
9f6dc2a4b2 Only pass abuse report ID to AbuseReportMailer. 2015-10-18 11:58:45 +02:00
Jonathan Rochkind
ae4fbae26c Send an email (to support) when a user is reported for spam 2015-10-08 17:33:57 -04:00