Commit Graph

10 Commits

Author SHA1 Message Date
GitLab Bot be2142bf5e Add latest changes from gitlab-org/gitlab@master 2020-10-20 12:08:54 +00:00
GitLab Bot 6e3880e2bb Add latest changes from gitlab-org/gitlab@master 2019-11-12 21:06:30 +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
Marcel Amirault 6afcc4ef52 Change unicode for non-standard spaces 2019-02-12 16:01:10 +00:00
Eric Eastwood f340af1c59 Move email footer info to a single line
From
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5031#note_64372406
2018-03-21 12:29:20 -05:00
Alessio Caiazza 4b4e83dc12
Add CSS hidden class in mailer layout 2017-11-22 11:09:17 +01:00
Alexis Reigel cdcf461e04 gitlab.com contrib footer only for devise mails 2017-06-13 22:36:45 +02:00
Alexis Reigel 96c500dbb2 add contribution footer to all emails 2017-06-13 22:36:45 +02:00
Alexis Reigel a3bd6ce8a3 use common devise layout and use heading style 2017-06-13 22:36:45 +02:00