diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-28 19:16:30 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-28 19:16:30 +0300 |
| commit | 790a51a42778b3aa3fb5c8c5afe687ef06dd4433 (patch) | |
| tree | df21d214bbc24e4f74af90427e5b8b1116057855 /app/views/admin | |
| parent | 4df6460b4e3a5b1d2f383a37c9121bfbd59ea807 (diff) | |
| parent | 77985826d94454514c40b8da926e13b3b3791841 (diff) | |
Merge branch '56863-system-messages-in-email' into 'master'
Show header and footer system messages in email
Closes #56863
See merge request gitlab-org/gitlab-ce!25474
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/appearances/_system_header_footer_form.html.haml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/views/admin/appearances/_system_header_footer_form.html.haml b/app/views/admin/appearances/_system_header_footer_form.html.haml index ca9d6adebeb..4301ebd05af 100644 --- a/app/views/admin/appearances/_system_header_footer_form.html.haml +++ b/app/views/admin/appearances/_system_header_footer_form.html.haml @@ -13,6 +13,15 @@ .form-group = form.label :footer_message, _('Footer message'), class: 'col-form-label label-bold' = form.text_area :footer_message, placeholder: _('State your message to activate'), class: "form-control js-autosize" + .form-group + .form-check + = form.check_box :email_header_and_footer_enabled, class: 'form-check-input' + = form.label :email_header_and_footer_enabled, class: 'label-bold' do + = _('Enable header and footer in emails') + + .hint + = _('Add header and footer to emails. Please note that color settings will only be applied within the application interface') + .form-group.js-toggle-colors-container %button.btn.btn-link.js-toggle-colors-link{ type: 'button' } = _('Customize colors') |