diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-09-04 17:23:09 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-09-04 17:23:09 +0300 |
| commit | 2adc4ccf4dedcc33207658ec55873aee38598b6e (patch) | |
| tree | dc15857e322cf7b7a0a8dd4343f5ab57a4536688 | |
| parent | c65cdb4a1428b5594abfb89de2fced036db01985 (diff) | |
| parent | 305159ff32d8ce7d6a3dec5a1a08f0dad2639857 (diff) | |
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
| -rw-r--r-- | config/gitlab.yml.example | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 6dcaefc05d5..e3693f612e3 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -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 |