diff options
author | Evan Read <eread@gitlab.com> | 2019-08-09 08:47:56 +0300 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2019-08-09 08:47:56 +0300 |
commit | 6e33ec1716078609e1a99e3c1a949f2dcb49c63e (patch) | |
tree | 0189c0fcbd6da8071dd25650d555cc60815a6aee | |
parent | 44aa23b9ab7341836e00968ea82b6725f3318a21 (diff) | |
parent | 7146f2ecfdd39e19d5fb6115adc0bc654f44eb89 (diff) |
Merge branch 'docs/fix-email-hostname-instructions' into 'master'
Corrected custom email hostname instructions
See merge request gitlab-org/gitlab-ce!31646
-rw-r--r-- | doc/user/admin_area/settings/email.md | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/user/admin_area/settings/email.md b/doc/user/admin_area/settings/email.md index 77c9d097283..490163c1816 100644 --- a/doc/user/admin_area/settings/email.md +++ b/doc/user/admin_area/settings/email.md @@ -34,11 +34,13 @@ This configuration option sets the email hostname for [private commit emails](.. In order to change this option: -1. Go to **Admin area > Settings** (`/admin/application_settings`). -1. Under the **Email** section, change the **Custom hostname (for private commit emails)** field. -1. Hit **Save** for the changes to take effect. +1. Go to **Admin Area > Settings > Preferences** (`/admin/application_settings/preferences`). +1. Expand the **Email** section. +1. Enter the desire hostname in the **Custom hostname (for private commit emails)** field. +1. Click **Save changes**. -NOTE: **Note**: Once the hostname gets configured, every private commit email using the previous hostname, will not get +NOTE: **Note:** +Once the hostname gets configured, every private commit email using the previous hostname, will not get recognized by GitLab. This can directly conflict with certain [Push rules](../../../push_rules/push_rules.md) such as `Check whether author is a GitLab user` and `Check whether committer is the current authenticated user`. |