Commit 6b2e077b authored by Marcin Sedlak-Jakubowski's avatar Marcin Sedlak-Jakubowski

Merge branch 'gottesman.rachelg-master-patch-22559' into 'master'

Fix future tense issues

See merge request gitlab-org/gitlab!49111
parents 7548fa21 a733d940
...@@ -5,7 +5,6 @@ group: Project Management ...@@ -5,7 +5,6 @@ group: Project Management
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
--- ---
# Email **(CORE ONLY)** # Email **(CORE ONLY)**
You can customize some of the content in emails sent from your GitLab instance. You can customize some of the content in emails sent from your GitLab instance.
...@@ -18,7 +17,7 @@ The logo in the header of some emails can be customized, see the [logo customiza ...@@ -18,7 +17,7 @@ The logo in the header of some emails can be customized, see the [logo customiza
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5031) in [GitLab Premium](https://about.gitlab.com/pricing/) 10.7. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5031) in [GitLab Premium](https://about.gitlab.com/pricing/) 10.7.
The additional text will appear at the bottom of any email and can be used for The additional text appears at the bottom of any email and can be used for
legal/auditing/compliance reasons. legal/auditing/compliance reasons.
1. Go to **Admin Area > Settings > Preferences** (`/admin/application_settings/preferences`). 1. Go to **Admin Area > Settings > Preferences** (`/admin/application_settings/preferences`).
...@@ -37,12 +36,12 @@ In order to change this option: ...@@ -37,12 +36,12 @@ In order to change this option:
1. Go to **Admin Area > Settings > Preferences** (`/admin/application_settings/preferences`). 1. Go to **Admin Area > Settings > Preferences** (`/admin/application_settings/preferences`).
1. Expand the **Email** section. 1. Expand the **Email** section.
1. Enter the desire hostname in the **Custom hostname (for private commit emails)** field. 1. Enter the desired hostname in the **Custom hostname (for private commit emails)** field.
1. Click **Save changes**. 1. Select **Save changes**.
NOTE: **Note:** NOTE: **Note:**
Once the hostname gets configured, every private commit email using the previous hostname, will not get Once the hostname gets configured, every private commit email using the previous hostname is not
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`.
<!-- ## Troubleshooting <!-- ## Troubleshooting
......
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