Commit c678b5bf authored by Marcia Ramos's avatar Marcia Ramos

Merge branch 'docs/ssot_admin_area_email' into 'master'

Edit email settings for SSOT

See merge request gitlab-org/gitlab-ce!28629
parents 274f044a dc9e42b9
---
type: reference
---
# Email # Email
You can customize some of the content in emails sent from your GitLab instance.
## Custom logo ## 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). The logo in the header of some emails can be customized, see the [logo customization section](../../../customization/branded_page_and_email_header.md).
## Custom additional text **[PREMIUM ONLY]** ## Custom additional text **[PREMIUM ONLY]**
>[Introduced][ee-5031] in [GitLab Premium][eep] 10.7. > [Introduced][ee-5031] in [GitLab Premium][eep] 10.7.
The additional text will appear at the bottom of any email and can be used for The additional text will appear at the bottom of any email and can be used for
legal/auditing/compliance reasons. legal/auditing/compliance reasons.
...@@ -24,8 +30,8 @@ legal/auditing/compliance reasons. ...@@ -24,8 +30,8 @@ legal/auditing/compliance reasons.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22560) in GitLab 11.5. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22560) in GitLab 11.5.
This configuration option sets the email hostname for [private commit emails](../../profile/index.md#private-commit-email), This configuration option sets the email hostname for [private commit emails](../../profile/index.md#private-commit-email).
and it's, by default, set to `users.noreply.YOUR_CONFIGURED_HOSTNAME`. By default it is set to `users.noreply.YOUR_CONFIGURED_HOSTNAME`.
In order to change this option: In order to change this option:
...@@ -36,3 +42,15 @@ In order to change this option: ...@@ -36,3 +42,15 @@ In order to change this option:
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](https://docs.gitlab.com/ee/push_rules/push_rules.html) such as recognized by GitLab. This can directly conflict with certain [Push rules](https://docs.gitlab.com/ee/push_rules/push_rules.html) 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`.
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
one might have when setting this up, or when something is changed, or on upgrading, it's
important to describe those, too. Think of things that may go wrong and include them here.
This is important to minimize requests for support, and to avoid doc comments with
questions that you know someone might ask.
Each scenario can be a third-level heading, e.g. `### Getting error message X`.
If you have none to add when creating a doc, leave this section in place
but commented out to help encourage others to add to it in the future. -->
\ No newline at end of file
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