diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /config/mail_room.yml | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
download | gitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'config/mail_room.yml')
-rw-r--r-- | config/mail_room.yml | 7 |
1 files changed, 7 insertions, 0 deletions
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 %> |