diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-06-15 17:29:44 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-06-15 17:29:44 +0300 |
| commit | 0e76badd761ecb07adea7744957d17744d0ca7d2 (patch) | |
| tree | 4c09ad0544e5ca860c372e0faa1ab390b0aad215 /doc/integration | |
| parent | 1ed954e8a7abd3a8bc1649d0deec6d1ee2149496 (diff) | |
| parent | c3836b9e45f8ad8609e80ff09f96f03d2634b507 (diff) | |
Merge branch 'fix_google_oauth_docs' into 'master'
Update google.md to reflect need for Google+ API for oauth integration;
Closes #44685
See merge request gitlab-org/gitlab-ce!18610
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/google.md | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/integration/google.md b/doc/integration/google.md index ae1d848f439..8906f91b6b4 100644 --- a/doc/integration/google.md +++ b/doc/integration/google.md @@ -35,7 +35,12 @@ In Google's side: 1. You should now be able to see a Client ID and Client secret. Note them down or keep this page open as you will need them later. -1. From the **Dashboard** select **ENABLE APIS AND SERVICES > Compute > Google Kubernetes Engine API > Enable** +1. From the **Dashboard** select **ENABLE APIS AND SERVICES > Compute > Google+ API > Enable** +1. To enable projects to access [Google Kubernetes Engine](../user/project/clusters/index.md), you must also + enable these APIs: + - Google Kubernetes Engine API + - Cloud Resource Manager API + - Cloud Billing API On your GitLab server: |