diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-26 12:31:41 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-26 12:31:41 +0000 |
| commit | 6b45a012665bc2d5d94c1937ae910e75fb653e02 (patch) | |
| tree | ee86174d13786fb665565738943cdb64cbe0084c /doc | |
| parent | b187a3f2bb00a0a0a6e5f8369edf2d6430a7af6e (diff) | |
| parent | 5d96b1489e57ee66e50b8ff5ea018264892c8185 (diff) | |
| download | gitlab-ce-6b45a012665bc2d5d94c1937ae910e75fb653e02.tar.gz | |
Merge branch 'ueberbit/gitlab-ce-omniauth-azure-oauth2' into 'master'
Update omniauth-azure-oauth2 to 0.0.9 (Support Office 365 Germany)
See merge request gitlab-org/gitlab-ce!14501
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/integration/azure.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/integration/azure.md b/doc/integration/azure.md index 5e3e9f5ab77..f3c9c498634 100644 --- a/doc/integration/azure.md +++ b/doc/integration/azure.md @@ -74,6 +74,9 @@ To enable the Microsoft Azure OAuth2 OmniAuth provider you must register your ap tenant_id: "TENANT ID" } } ``` + The `base_azure_url` is optional and can be added for different locales; + e.g. `base_azure_url: "https://login.microsoftonline.de"`. + 1. Replace 'CLIENT ID', 'CLIENT SECRET' and 'TENANT ID' with the values you got above. 1. Save the configuration file. |