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>2023-01-16 03:09:24 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-16 03:09:24 +0300
commitde6848e2753ab5834699bf0c9225f17ba0bd4b3d (patch)
tree4dc1a18a3c64e0aaced80fdf01a80e60a3155cea /spec/fixtures
parent7eea19a9f4b74928e6cd104f489e2d6cbe08f90f (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/config/mail_room_enabled_ms_graph.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/fixtures/config/mail_room_enabled_ms_graph.yml b/spec/fixtures/config/mail_room_enabled_ms_graph.yml
index 791760e1dfd..71fc7e73e35 100644
--- a/spec/fixtures/config/mail_room_enabled_ms_graph.yml
+++ b/spec/fixtures/config/mail_room_enabled_ms_graph.yml
@@ -4,7 +4,7 @@ test:
address: "gitlab-incoming+%{key}@gmail.com"
user: "gitlab-incoming@gmail.com"
mailbox: "inbox"
- expunge_deleted: true
+ delete_after_delivery: false
inbox_method: "microsoft_graph"
inbox_options:
tenant_id: "12345"
@@ -17,7 +17,7 @@ test:
address: "gitlab-incoming+%{key}@gmail.com"
user: "gitlab-incoming@gmail.com"
mailbox: "inbox"
- expunge_deleted: true
+ delete_after_delivery: false
inbox_method: "microsoft_graph"
inbox_options:
tenant_id: "12345"