Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
83fe9a4a
Commit
83fe9a4a
authored
Oct 08, 2020
by
John Long
Committed by
Amy Qualls
Oct 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wording for examples
parent
ca6a58d6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
7 deletions
+2
-7
doc/administration/incoming_email.md
doc/administration/incoming_email.md
+2
-7
No files found.
doc/administration/incoming_email.md
View file @
83fe9a4a
...
...
@@ -433,6 +433,7 @@ incoming_email:
# Whether the IMAP server uses SSL
ssl
:
true
```
#### Microsoft Office 365
Example configurations for Microsoft Office 365 with IMAP enabled.
...
...
@@ -446,7 +447,7 @@ must be enabled via Powershell, and is not enabled by default.
Enable sub-addressing first via Powershell:
NOTE:
**Note:**
This seris of commands will enable sub-addressing at the organization
This seri
e
s of commands will enable sub-addressing at the organization
level in Office 365. This will allow all mailboxes in the organization
to receive sub-addressed mail.
...
...
@@ -471,7 +472,6 @@ gitlab_rails['incoming_email_enabled'] = true
# The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to.
# The placeholder can be omitted but if present, it must appear in the "user" part of the address (before the `@`).
# Exchange does not support sub-addressing, so a catch-all mailbox must be used.
gitlab_rails
[
'incoming_email_address'
]
=
"incoming+%{key}@office365.example.com"
# Email account username
...
...
@@ -496,7 +496,6 @@ incoming_email:
# The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to.
# The placeholder can be omitted but if present, it must appear in the "user" part of the address (before the `@`).
# Exchange does not support sub-addressing, so a catch-all mailbox must be used.
address
:
"
incoming+%{key}@office365.example.comm"
# Email account username
...
...
@@ -524,7 +523,6 @@ gitlab_rails['incoming_email_enabled'] = true
# The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to.
# The placeholder can be omitted but if present, it must appear in the "user" part of the address (before the `@`).
# Exchange does not support sub-addressing, so a catch-all mailbox must be used.
gitlab_rails
[
'incoming_email_address'
]
=
"incoming-%{key}@office365.example.com"
# Email account username
...
...
@@ -549,7 +547,6 @@ incoming_email:
# The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to.
# The placeholder can be omitted but if present, it must appear in the "user" part of the address (before the `@`).
# Exchange does not support sub-addressing, so a catch-all mailbox must be used.
address
:
"
incoming-%{key}@office365.example.com"
# Email account username
...
...
@@ -575,7 +572,6 @@ Example for Omnibus installs:
```
ruby
gitlab_rails
[
'incoming_email_enabled'
]
=
true
# Exchange does not support sub-addressing, and we're not using a catch-all mailbox so %{key} is not used here
gitlab_rails
[
'incoming_email_address'
]
=
"incoming@office365.example.com"
# Email account username
...
...
@@ -598,7 +594,6 @@ Example for source installs:
incoming_email
:
enabled
:
true
# Exchange does not support sub-addressing, and we're not using a catch-all mailbox so %{key} is not used here
address
:
"
incoming@office365.example.com"
# Email account username
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment