kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/doc/user/admin_area/settings/email.md

58 lines
2.4 KiB
Markdown
Raw Normal View History

Edit email settings for SSOT
2019-05-23 11:42:33 -04:00
---
type: reference
---
Add core badges to admin_area docs Some admin_area docs were missing the Core Only badge
2019-08-22 12:25:52 -04:00
# Email **(CORE ONLY)**
Add custom additonal email text to all emails Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474 Conflicts: db/schema.rb ee/app/controllers/ee/admin/application_settings_controller.rb ee/app/helpers/ee/application_settings_helper.rb ee/app/models/ee/application_setting.rb ee/app/models/license.rb ee/app/views/layouts/service_desk.html.haml ee/app/views/notify/approved_merge_request_email.html.haml ee/app/views/notify/service_desk_new_note_email.text.erb ee/app/views/notify/service_desk_thank_you_email.text.erb ee/app/views/notify/unapproved_merge_request_email.html.haml ee/lib/ee/api/entities.rb ee/spec/controllers/admin/application_settings_controller_spec.rb ee/spec/models/application_setting_spec.rb ee/spec/requests/api/settings_spec.rb lib/api/settings.rb spec/mailers/previews/notify_preview.rb
2018-04-04 13:11:55 -04:00
Edit email settings for SSOT
2019-05-23 11:42:33 -04:00
You can customize some of the content in emails sent from your GitLab instance.
Add custom additonal email text to all emails Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474 Conflicts: db/schema.rb ee/app/controllers/ee/admin/application_settings_controller.rb ee/app/helpers/ee/application_settings_helper.rb ee/app/models/ee/application_setting.rb ee/app/models/license.rb ee/app/views/layouts/service_desk.html.haml ee/app/views/notify/approved_merge_request_email.html.haml ee/app/views/notify/service_desk_new_note_email.text.erb ee/app/views/notify/service_desk_thank_you_email.text.erb ee/app/views/notify/unapproved_merge_request_email.html.haml ee/lib/ee/api/entities.rb ee/spec/controllers/admin/application_settings_controller_spec.rb ee/spec/models/application_setting_spec.rb ee/spec/requests/api/settings_spec.rb lib/api/settings.rb spec/mailers/previews/notify_preview.rb
2018-04-04 13:11:55 -04:00
## 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).
User can keep their commit email private The private commit email is automatically generated in the format: id-username@noreply.HOSTNAME GitLab instance admins are able to change the HOSTNAME portion, that defaults to Gitlab's hostname, to whatever they prefer.
2018-11-07 06:00:21 -05:00
Changing badges to use parentheses not brackets Previously, we used brackets to denote the tier badges, but this made Kramdown, the docs site Markdown renderer, show many warnings when building the site. This is now fixed by using parentheses instead of square brackets. This was caused by [PREMIUM] looking like a link to Kramdown, which couldn't find a URL there. See: - https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/484 - https://gitlab.com/gitlab-org/gitlab-ce/issues/63800
2019-07-08 04:50:38 -04:00
## Custom additional text **(PREMIUM ONLY)**
Docs: Merge EE doc/user/admin_area to CE
2019-05-05 10:17:38 -04:00
Edit email settings for SSOT
2019-05-23 11:42:33 -04:00
> [Introduced][ee-5031] in [GitLab Premium][eep] 10.7.
Docs: Merge EE doc/user/admin_area to CE
2019-05-05 10:17:38 -04:00
The additional text will appear at the bottom of any email and can be used for
legal/auditing/compliance reasons.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62446
2019-08-07 04:42:02 -04:00
1. Go to **Admin Area > Settings > Preferences** (`/admin/application_settings/preferences`).
1. Expand the **Email** section.
1. Enter your text in the **Additional text** field.
1. Click **Save**.
Docs: Merge EE doc/user/admin_area to CE
2019-05-05 10:17:38 -04:00
Add latest changes from gitlab-org/gitlab@master
2019-09-18 10:02:45 -04:00
[ee-5031]: https://gitlab.com/gitlab-org/gitlab/merge_requests/5031
Docs: Merge EE doc/user/admin_area to CE
2019-05-05 10:17:38 -04:00
[eep]: https://about.gitlab.com/pricing/
User can keep their commit email private The private commit email is automatically generated in the format: id-username@noreply.HOSTNAME GitLab instance admins are able to change the HOSTNAME portion, that defaults to Gitlab's hostname, to whatever they prefer.
2018-11-07 06:00:21 -05:00
## Custom hostname for private commit emails
Add latest changes from gitlab-org/gitlab@master
2019-09-18 10:02:45 -04:00
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/22560) in GitLab 11.5.
User can keep their commit email private The private commit email is automatically generated in the format: id-username@noreply.HOSTNAME GitLab instance admins are able to change the HOSTNAME portion, that defaults to Gitlab's hostname, to whatever they prefer.
2018-11-07 06:00:21 -05:00
Edit email settings for SSOT
2019-05-23 11:42:33 -04:00
This configuration option sets the email hostname for [private commit emails](../../profile/index.md#private-commit-email).
By default it is set to `users.noreply.YOUR_CONFIGURED_HOSTNAME`.
User can keep their commit email private The private commit email is automatically generated in the format: id-username@noreply.HOSTNAME GitLab instance admins are able to change the HOSTNAME portion, that defaults to Gitlab's hostname, to whatever they prefer.
2018-11-07 06:00:21 -05:00
In order to change this option:
Corrected custom email hostname instructions
2019-08-09 01:47:55 -04:00
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**.
User can keep their commit email private The private commit email is automatically generated in the format: id-username@noreply.HOSTNAME GitLab instance admins are able to change the HOSTNAME portion, that defaults to Gitlab's hostname, to whatever they prefer.
2018-11-07 06:00:21 -05:00
Corrected custom email hostname instructions
2019-08-09 01:47:55 -04:00
NOTE: **Note:**
Once the hostname gets configured, every private commit email using the previous hostname, will not get
Docs: Convert remaining links in /user to relative
2019-05-31 07:26:18 -04:00
recognized by GitLab. This can directly conflict with certain [Push rules](../../../push_rules/push_rules.md) such as
User can keep their commit email private The private commit email is automatically generated in the format: id-username@noreply.HOSTNAME GitLab instance admins are able to change the HOSTNAME portion, that defaults to Gitlab's hostname, to whatever they prefer.
2018-11-07 06:00:21 -05:00
`Check whether author is a GitLab user` and `Check whether committer is the current authenticated user`.
Edit email settings for SSOT
2019-05-23 11:42:33 -04:00
<!-- ## 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
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62446
2019-08-07 04:42:02 -04:00
but commented out to help encourage others to add to it in the future. -->
Copy permalink