Merge branch 'winh-service-desk-config-requirement' into 'master'

Add note to gitlab.yml about Service Desk requirement

See merge request gitlab-org/gitlab-ce!32651
This commit is contained in:
Sean McGivern 2019-09-04 14:23:09 +00:00
commit 2adc4ccf4d

View file

@ -158,6 +158,7 @@ production: &base
# The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to.
# The placeholder can be omitted but if present, it must appear in the "user" part of the address (before the `@`).
# Please be aware that a placeholder is required for the Service Desk feature to work.
address: "gitlab-incoming+%{key}@gmail.com"
# Email account username