diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-06-15 17:29:44 +0300 |
|---|---|---|
| committer | Chris Peressini <cperessini@gitlab.com> | 2018-06-18 11:32:04 +0300 |
| commit | b1c52129a7087603b9e7be4351dce6717e099854 (patch) | |
| tree | 5e79179766dcac6c8dd2add3da582d44926325ec /doc | |
| parent | 7c48708e16e9ca2807e2da37b026a5def15c7049 (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')
| -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: |