Commit 6e33ec17 authored by Evan Read's avatar Evan Read

Merge branch 'docs/fix-email-hostname-instructions' into 'master'

Corrected custom email hostname instructions

See merge request gitlab-org/gitlab-ce!31646
parents 44aa23b9 7146f2ec
...@@ -34,11 +34,13 @@ This configuration option sets the email hostname for [private commit emails](.. ...@@ -34,11 +34,13 @@ This configuration option sets the email hostname for [private commit emails](..
In order to change this option: In order to change this option:
1. Go to **Admin area > Settings** (`/admin/application_settings`). 1. Go to **Admin Area > Settings > Preferences** (`/admin/application_settings/preferences`).
1. Under the **Email** section, change the **Custom hostname (for private commit emails)** field. 1. Expand the **Email** section.
1. Hit **Save** for the changes to take effect. 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 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`. `Check whether author is a GitLab user` and `Check whether committer is the current authenticated user`.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment