Commit 0397b7e9 authored by Marcin Sedlak-Jakubowski's avatar Marcin Sedlak-Jakubowski

Merge branch 'calebcooper-fix-addresses-gmail' into 'master'

Fix inconsistent addresses gmail

See merge request gitlab-org/gitlab!74093
parents 91cd1fa5 7f0fac83
...@@ -207,7 +207,7 @@ To configure a custom mailbox for Service Desk with IMAP, add the following snip ...@@ -207,7 +207,7 @@ To configure a custom mailbox for Service Desk with IMAP, add the following snip
service_desk_email: service_desk_email:
enabled: true enabled: true
address: "project_contact+%{key}@example.com" address: "project_contact+%{key}@example.com"
user: "project_support@example.com" user: "project_contact@example.com"
password: "[REDACTED]" password: "[REDACTED]"
host: "imap.gmail.com" host: "imap.gmail.com"
port: 993 port: 993
...@@ -224,7 +224,7 @@ To configure a custom mailbox for Service Desk with IMAP, add the following snip ...@@ -224,7 +224,7 @@ To configure a custom mailbox for Service Desk with IMAP, add the following snip
```ruby ```ruby
gitlab_rails['service_desk_email_enabled'] = true gitlab_rails['service_desk_email_enabled'] = true
gitlab_rails['service_desk_email_address'] = "project_contact+%{key}@gmail.com" gitlab_rails['service_desk_email_address'] = "project_contact+%{key}@gmail.com"
gitlab_rails['service_desk_email_email'] = "project_support@gmail.com" gitlab_rails['service_desk_email_email'] = "project_contact@gmail.com"
gitlab_rails['service_desk_email_password'] = "[REDACTED]" gitlab_rails['service_desk_email_password'] = "[REDACTED]"
gitlab_rails['service_desk_email_mailbox_name'] = "inbox" gitlab_rails['service_desk_email_mailbox_name'] = "inbox"
gitlab_rails['service_desk_email_idle_timeout'] = 60 gitlab_rails['service_desk_email_idle_timeout'] = 60
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment