diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-05 13:20:15 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-05 13:20:15 +0300 |
| commit | dda326f1d390e360567ba8acaa135a1dfb98042c (patch) | |
| tree | f0868809bd5f560fa5651cb07fae35bb48d0d78f /doc | |
| parent | 942488b8c420032a5b067d0a784c46b740a6f7ec (diff) | |
| parent | a6c7d8050eb6eeb0373f69a3f99c7f7b64f77e07 (diff) | |
Merge branch 'ce-4474-custom-additional-text-in-confirmation-email' into 'master'
Add custom additional text to emails -- CE backport
Closes gitlab-ee#4474
See merge request gitlab-org/gitlab-ce!18183
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/index.md | 1 | ||||
| -rw-r--r-- | doc/user/admin_area/settings/email.md | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md index 60a45426636..c8f27719ce9 100644 --- a/doc/administration/index.md +++ b/doc/administration/index.md @@ -85,7 +85,6 @@ created in snippets, wikis, and repos. - [Postfix for incoming email](reply_by_email_postfix_setup.md): Set up a basic Postfix mail server with IMAP authentication on Ubuntu for incoming emails. -server with IMAP authentication on Ubuntu, to be used with Reply by email. - [User Cohorts](../user/admin_area/user_cohorts.md): Display the monthly cohorts of new users and their activities over time. [reply by email]: reply_by_email.md diff --git a/doc/user/admin_area/settings/email.md b/doc/user/admin_area/settings/email.md new file mode 100644 index 00000000000..7c9e5bf882e --- /dev/null +++ b/doc/user/admin_area/settings/email.md @@ -0,0 +1,5 @@ +# Email + +## Custom logo + +The logo in the header of some emails can be customized, see the [logo customization section](../../../customization/branded_page_and_email_header.md). |