Commit 0e76badd authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

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
parents 1ed954e8 c3836b9e
...@@ -35,7 +35,12 @@ In Google's side: ...@@ -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 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. 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: On your GitLab server:
......
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