diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-10-06 14:41:43 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-10-06 14:41:43 +0200 |
| commit | 509d9f0120a54716103d410178a7344779d94e52 (patch) | |
| tree | f509b881b9e3bf9886a6d4008ed034a5970afeae | |
| parent | 53e5b305c316506c952c244341804e66d38d1c27 (diff) | |
| download | gitlab-ce-509d9f0120a54716103d410178a7344779d94e52.tar.gz | |
Refine Google integration steps
| -rw-r--r-- | doc/integration/google.md | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/doc/integration/google.md b/doc/integration/google.md index 0eb90f32b0a..52de5dc61be 100644 --- a/doc/integration/google.md +++ b/doc/integration/google.md @@ -8,7 +8,7 @@ with Google. Google will generate a client ID and secret key for you to use. In Google's side: 1. Navigate to the [cloud resource manager](https://console.cloud.google.com/cloud-resource-manager) page -1. Select "Create Project" +1. Select **Create Project** 1. Provide the project information: - **Project name** - "GitLab" works just fine here. - **Project ID** - Must be unique to all Google Developer registered applications. @@ -17,24 +17,25 @@ In Google's side: 1. Refresh the page and you should see your new project in the list 1. Go to the [Google API Console](https://console.developers.google.com/apis/dashboard) 1. Select the previously created project form the upper left corner -1. Click on the project and select "Google Cloud APIs" in the overview -1. Select "Credentials" in the left menu -1. Select "Create New Client ID" +1. Select **Credentials** from the sidebar +1. Select **OAuth consent screen** and fill the form with the required information +1. In the **Credentials** tab, select **Create credentials > OAuth client ID** 1. Fill in the required information - **Application type** - Choose "Web Application" + - **Name** - Use the default one or provide your own - **Authorized JavaScript origins** -This isn't really used by GitLab but go ahead and put `https://gitlab.example.com` - **Authorized redirect URIs** - Enter your domain name followed by the - callback URIs: + callback URIs one at a time: ``` https://gitlab.example.com/users/auth/google_oauth2/callback https://gitlab.example.com/google_api/auth/callback ``` -1. Under the heading "Client ID for web application" you should see a Client ID - and Client secret. Note them down or keep this page open as you will need them - later. +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 > Google Cloud APIs > Container Engine API > Enable** On your GitLab server: |