diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 00:07:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 00:07:50 +0000 |
| commit | 8dc1e72e2b5cb6112d5468194580edb186de4659 (patch) | |
| tree | f77ab94b3a74dcb06c97ce1ea54a6f89eaeb26bf /config | |
| parent | 0df696c5f77936ecae5ea3c3f17b3e885d7dea0b (diff) | |
| download | gitlab-ce-8dc1e72e2b5cb6112d5468194580edb186de4659.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 3 | ||||
| -rw-r--r-- | config/mail_room.yml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 1a042f0e349..9a2e470f852 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -202,6 +202,9 @@ production: &base # # log_path: log/mail_room_json.log + # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery + expunge_deleted: false + ## Build Artifacts artifacts: enabled: true diff --git a/config/mail_room.yml b/config/mail_room.yml index da37ef60587..23170acbf65 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -17,6 +17,7 @@ :name: <%= config[:mailbox].to_json %> :delete_after_delivery: true + :expunge_deleted: <%= config[:expunge_deleted].to_json %> :delivery_method: sidekiq :delivery_options: |