diff options
| author | Alexandru Croitor <acroitor@gitlab.com> | 2019-02-20 18:18:15 +0300 |
|---|---|---|
| committer | Alexandru Croitor <acroitor@gitlab.com> | 2019-02-27 23:07:50 +0300 |
| commit | 77985826d94454514c40b8da926e13b3b3791841 (patch) | |
| tree | 00da4c2f5b72001e38b56e9d994cabc278ec0d7c /locale | |
| parent | 177f9ca88b4d080e91b6c4ce2bba04d2fba95c07 (diff) | |
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 'locale')
| -rw-r--r-- | locale/gitlab.pot | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 588dd766bdc..c699097be4a 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -393,6 +393,9 @@ msgstr "" msgid "Add a table" msgstr "" +msgid "Add header and footer to emails. Please note that color settings will only be applied within the application interface" +msgstr "" + msgid "Add image comment" msgstr "" @@ -2959,6 +2962,9 @@ msgstr "" msgid "Enable group Runners" msgstr "" +msgid "Enable header and footer in emails" +msgstr "" + msgid "Enable or disable version check and usage ping." msgstr "" |