diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-09 16:00:38 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-09 16:00:38 +0000 |
| commit | 72c2f3c12100243837d371b959cce2e98ba7804f (patch) | |
| tree | bbcfba8c2a8f5535f7765c96b3d0ccfab89c30fc | |
| parent | 320590180703c620cedd6eb6023548dca2d026cf (diff) | |
| parent | 158b640e5ee2ff53136909b0a132a5888e900357 (diff) | |
| download | gitlab-ce-72c2f3c12100243837d371b959cce2e98ba7804f.tar.gz | |
Merge branch 'patch-17' into 'master'
Update google.md
See merge request !12010
| -rw-r--r-- | doc/integration/google.md | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/doc/integration/google.md b/doc/integration/google.md index 1e7ad90c5a8..d5b523e6dc0 100644 --- a/doc/integration/google.md +++ b/doc/integration/google.md @@ -72,6 +72,21 @@ To enable the Google OAuth2 OmniAuth provider you must register your application 1. Change 'YOUR_APP_SECRET' to the client secret from the Google Developer page from step 10. +1. Make sure that you configure GitLab to use an FQDN as Google will not accept raw IP addresses. + + For Omnibus packages: + + ```ruby + external_url 'https://gitlab.example.com' + ``` + + For installations from source: + + ```yaml + gitlab: + host: https://gitlab.example.com + ``` + 1. Save the configuration file. 1. [Reconfigure][] or [restart GitLab][] for the changes to take effect if you |