Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-13 03:07:50 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-13 03:07:50 +0300
commit8dc1e72e2b5cb6112d5468194580edb186de4659 (patch)
treef77ab94b3a74dcb06c97ce1ea54a6f89eaeb26bf /spec/config
parent0df696c5f77936ecae5ea3c3f17b3e885d7dea0b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/config')
-rw-r--r--spec/config/mail_room_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb
index fcef4e7a9b0..bd8269fb2c5 100644
--- a/spec/config/mail_room_spec.rb
+++ b/spec/config/mail_room_spec.rb
@@ -53,7 +53,8 @@ describe 'mail_room.yml' do
email: 'gitlab-incoming@gmail.com',
password: '[REDACTED]',
name: 'inbox',
- idle_timeout: 60
+ idle_timeout: 60,
+ expunge_deleted: true
}
expected_options = {
redis_url: gitlab_redis_queues.url,