7 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	c59765a50a	Add latest changes from gitlab-org/gitlab@master	2020-06-24 18:09:03 +00:00
GitLab Bot	6791eefead	Add latest changes from gitlab-org/gitlab@master	2019-10-21 09:06:22 +00:00
Ash McKenzie	19ff9d9899	Replace rails_helper.rb with spec_helper.rb ... rails_helper.rb's only logic was to require spec_helper.rb.	2019-08-30 12:26:18 +10: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
Grzegorz Bizon	0430b76441	Enable Style/DotPosition Rubocop 👮	2017-06-21 13:48:12 +00:00
Robert Speicher	01248d2051	Make AbuseReportMailer responsible for knowing if it should deliver	2016-01-04 18:59:25 -05:00