diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 21:08:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 21:08:52 +0000 |
| commit | d5d3c03598df712550acf0c6463a61c6e7dcc19e (patch) | |
| tree | d0fdf0f9cd6df46aea6ed16b6556f44055efb642 /spec/fixtures | |
| parent | 0434f38ef1dce4fe640fe1e4542235746ceb943c (diff) | |
| download | gitlab-ce-d5d3c03598df712550acf0c6463a61c6e7dcc19e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/config/mail_room_disabled.yml | 11 | ||||
| -rw-r--r-- | spec/fixtures/config/mail_room_enabled.yml | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/spec/fixtures/config/mail_room_disabled.yml b/spec/fixtures/config/mail_room_disabled.yml index 97f8cff051f..538f2a35f81 100644 --- a/spec/fixtures/config/mail_room_disabled.yml +++ b/spec/fixtures/config/mail_room_disabled.yml @@ -9,3 +9,14 @@ test: ssl: true start_tls: false mailbox: "inbox" + + service_desk_email: + enabled: false + address: "gitlab-incoming+%{key}@gmail.com" + user: "gitlab-incoming@gmail.com" + password: "[REDACTED]" + host: "imap.gmail.com" + port: 993 + ssl: true + start_tls: false + mailbox: "inbox" diff --git a/spec/fixtures/config/mail_room_enabled.yml b/spec/fixtures/config/mail_room_enabled.yml index 9c94649244d..e1f4c2f44de 100644 --- a/spec/fixtures/config/mail_room_enabled.yml +++ b/spec/fixtures/config/mail_room_enabled.yml @@ -9,3 +9,14 @@ test: ssl: true start_tls: false mailbox: "inbox" + + service_desk_email: + enabled: true + address: "gitlab-incoming+%{key}@gmail.com" + user: "gitlab-incoming@gmail.com" + password: "[REDACTED]" + host: "imap.gmail.com" + port: 993 + ssl: true + start_tls: false + mailbox: "inbox" |