Commit f7cb7e9f authored by Mike Jang's avatar Mike Jang

Merge branch 'sh-fix-azure-oauth2-callback' into 'master'

Fix default callback URL for Azure Active Directory v2

See merge request gitlab-org/gitlab!54508
parents 91ef152f 51990cd7
...@@ -112,7 +112,7 @@ As you go through the Microsoft procedure, keep the following in mind: ...@@ -112,7 +112,7 @@ As you go through the Microsoft procedure, keep the following in mind:
- If you have multiple instances of Azure Active Directory, you can switch to the desired tenant. - If you have multiple instances of Azure Active Directory, you can switch to the desired tenant.
- You're setting up a Web application. - You're setting up a Web application.
- The redirect URI requires the URL of the Azure OAuth callback of your GitLab - The redirect URI requires the URL of the Azure OAuth callback of your GitLab
installation. For example, `https://gitlab.example.com/users/auth/azure_oauth2/callback`. installation. For example, `https://gitlab.example.com/users/auth/azure_activedirectory_v2/callback`.
The type dropdown should be set to **Web**. The type dropdown should be set to **Web**.
- The `client ID` and `client secret` are terms associated with OAuth 2. In some Microsoft documentation, - The `client ID` and `client secret` are terms associated with OAuth 2. In some Microsoft documentation,
the terms may be listed as `Application ID` and `Application Secret`. the terms may be listed as `Application ID` and `Application Secret`.
......
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