From 9bc5f183df648e580c1d6682c2afc4ae96a28fe5 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 7 Apr 2021 21:09:01 +0000
Subject: Add latest changes from gitlab-org/gitlab@master
---
config/gitlab.yml.example | 7 +++++++
config/mail_room.yml | 7 +++++++
2 files changed, 14 insertions(+)
(limited to 'config')
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 18d91407b20..c451ce6b872 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -210,6 +210,13 @@ production: &base
# Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
expunge_deleted: false
+ # For Microsoft Graph support
+ # inbox_method: microsoft_graph
+ # inbox_options:
+ # tenant_id: "YOUR-TENANT-ID"
+ # client_id: "YOUR-CLIENT-ID"
+ # client_secret: "YOUR-CLIENT-SECRET"
+
## Consolidated object store config
## This will only take effect if the object_store sections are not defined
## within the types (e.g. artifacts, lfs, etc.).
diff --git a/config/mail_room.yml b/config/mail_room.yml
index 23170acbf65..25bda294a13 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -19,6 +19,13 @@
:delete_after_delivery: true
:expunge_deleted: <%= config[:expunge_deleted].to_json %>
+ <% if config[:inbox_method] %>
+ :inbox_method: <%= config[:inbox_method] %>
+ <% end %>
+ <% if config[:inbox_options].is_a?(Hash) %>
+ <%= config.slice(:inbox_options).to_yaml(indentation: 8).gsub(/^---\n/, '') %>
+ <% end %>
+
:delivery_method: sidekiq
:delivery_options:
:redis_url: <%= config[:redis_url].to_json %>
--
cgit v1.2.1