Skip to content
Snippets Groups Projects
Commit 27bc414d authored by Achilleas Pipinellis's avatar Achilleas Pipinellis
Browse files

Merge branch 'cablett-expunge-delete-text' into 'master'

Update text for delete vs expunge for clarity

See merge request gitlab-org/omnibus-gitlab!6084
parents de222027 98438978
No related branches found
No related tags found
1 merge request!72Intermediate build for testing purposes
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
# gitlab_rails['incoming_email_idle_timeout'] = 60 # gitlab_rails['incoming_email_idle_timeout'] = 60
####! The file name for internal `mail_room` JSON logfile ####! The file name for internal `mail_room` JSON logfile
# gitlab_rails['incoming_email_log_file'] = "/var/log/gitlab/mailroom/mail_room_json.log" # gitlab_rails['incoming_email_log_file'] = "/var/log/gitlab/mailroom/mail_room_json.log"
####! Permanently remove messages from the mailbox when they are deleted after delivery ####! Permanently remove messages from the mailbox when they are marked as deleted after delivery
# gitlab_rails['incoming_email_expunge_deleted'] = false # gitlab_rails['incoming_email_expunge_deleted'] = false
#### Inbox options (for Microsoft Graph) #### Inbox options (for Microsoft Graph)
......
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
# file path of internal `mail_room` JSON logs # file path of internal `mail_room` JSON logs
log_path: <%= @incoming_email_log_file %> log_path: <%= @incoming_email_log_file %>
# Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery # Whether to expunge (permanently remove) messages from the mailbox when they are marked as deleted after delivery
expunge_deleted: <%= @incoming_email_expunge_deleted %> expunge_deleted: <%= @incoming_email_expunge_deleted %>
# How mailroom delivers email content to Rails. There are two methods at the moment: # How mailroom delivers email content to Rails. There are two methods at the moment:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment