Skip to content
Snippets Groups Projects
Commit 906edafa authored by Jon Glassman's avatar Jon Glassman
Browse files

Merge branch 'samhewitt-master-patch-48778' into 'master'

Update to doc/settings/microsoft_graph_mailer.md

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6578



Merged-by: default avatarJon Glassman <jglassman@gitlab.com>
Approved-by: default avatarJon Glassman <jglassman@gitlab.com>
Co-authored-by: default avatarSam Hewitt <shewitt@gitlab.com>
parents 6f53fc8e 5a31121d
No related branches found
No related tags found
2 merge requests!102heptapod#1237: making 0.38 the new oldstable,!89Merged upstream 15.8.0+ce.0
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
[create an application](https://learn.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app) [create an application](https://learn.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app)
in the Azure Active Directory, and add the `Mail.Send` in the Azure Active Directory, and add the `Mail.Send`
[application permission](https://learn.microsoft.com/en-us/graph/permissions-reference). [application permission](https://learn.microsoft.com/en-us/graph/permissions-reference).
- Set the application permissions to **App-only access**. Make sure the permissions are not set to **Delegated**.
If you would rather send application emails using [Microsoft Graph API](https://learn.microsoft.com/en-us/graph/api/user-sendmail?view=graph-rest-1.0&tabs=http) If you would rather send application emails using [Microsoft Graph API](https://learn.microsoft.com/en-us/graph/api/user-sendmail?view=graph-rest-1.0&tabs=http)
with [OAuth 2.0 client credentials flow](https://learn.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-client-creds-grant-flow), with [OAuth 2.0 client credentials flow](https://learn.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-client-creds-grant-flow),
...@@ -64,3 +65,20 @@ ...@@ -64,3 +65,20 @@
- `gitlab_rails['gitlab_email_reply_to']`. - `gitlab_rails['gitlab_email_reply_to']`.
Other than permissions, this error is sometimes caused because the server does not allow the default `gitlab_email_from` value to be used. You should set the value to the email address for the account you're authenticating with. Other than permissions, this error is sometimes caused because the server does not allow the default `gitlab_email_from` value to be used. You should set the value to the email address for the account you're authenticating with.
### `Tail logs`
For troubleshooting, use the `tail logs` command to view live GitLab log updates:
```ruby
# Tail all logs for the application
sudo gitlab-ctl tail
# Tail logs for an application sub-directory
sudo gitlab-ctl tail gitlab-rails
# Tail logs for an individual file in the application
sudo gitlab-ctl tail nginx/gitlab_error.log
```
To stop any of these commands, press <kbd>Control</kbd>+<kbd>C</kbd>.
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