diff options
| author | Alexandru Croitor <acroitor@gitlab.com> | 2019-02-20 17:18:15 +0200 |
|---|---|---|
| committer | Alexandru Croitor <acroitor@gitlab.com> | 2019-02-27 22:07:50 +0200 |
| commit | 77985826d94454514c40b8da926e13b3b3791841 (patch) | |
| tree | 00da4c2f5b72001e38b56e9d994cabc278ec0d7c /app/views/layouts/notify.html.haml | |
| parent | 177f9ca88b4d080e91b6c4ce2bba04d2fba95c07 (diff) | |
| download | gitlab-ce-77985826d94454514c40b8da926e13b3b3791841.tar.gz | |
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
Diffstat (limited to 'app/views/layouts/notify.html.haml')
| -rw-r--r-- | app/views/layouts/notify.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index 1c3e05e07f4..8dff12c1b7f 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -7,6 +7,7 @@ = yield :head %body .content + = html_header_message = yield .footer{ style: "margin-top: 10px;" } %p @@ -30,3 +31,4 @@ adjust your notification settings. = email_action @target_url + = html_footer_message |