diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 03:07:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 03:07:50 +0300 |
| commit | 8dc1e72e2b5cb6112d5468194580edb186de4659 (patch) | |
| tree | f77ab94b3a74dcb06c97ce1ea54a6f89eaeb26bf /spec/fixtures | |
| parent | 0df696c5f77936ecae5ea3c3f17b3e885d7dea0b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/config/mail_room_enabled.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/fixtures/config/mail_room_enabled.yml b/spec/fixtures/config/mail_room_enabled.yml index e1f4c2f44de..535528b32ca 100644 --- a/spec/fixtures/config/mail_room_enabled.yml +++ b/spec/fixtures/config/mail_room_enabled.yml @@ -9,6 +9,7 @@ test: ssl: true start_tls: false mailbox: "inbox" + expunge_deleted: true service_desk_email: enabled: true @@ -20,3 +21,4 @@ test: ssl: true start_tls: false mailbox: "inbox" + expunge_deleted: true |