diff options
| author | Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> | 2015-07-30 12:38:21 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-30 13:19:37 +0200 |
| commit | 475afd37b656fa87e8f528670091a1923e391cef (patch) | |
| tree | 7d5c7067387954d2de07aed0eb53ef79501d1d8e /doc | |
| parent | 2778dec131c2afac9fcdb2c42365b69099a5ae5b (diff) | |
| download | gitlab-ce-475afd37b656fa87e8f528670091a1923e391cef.tar.gz | |
Updated Bitbucket OmniAuth documentation
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/integration/bitbucket.md | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/doc/integration/bitbucket.md b/doc/integration/bitbucket.md index 2eb6266ebe7..0078f4e15b2 100644 --- a/doc/integration/bitbucket.md +++ b/doc/integration/bitbucket.md @@ -7,7 +7,7 @@ Bitbucket will generate an application ID and secret key for you to use. 1. Sign in to Bitbucket. -1. Navigate to your individual user settings or a team's settings, depending on how you want the application registered. It does not matter if the application is registered as an individual or a team - that is entirely up to you. +1. Navigate to your individual user settings (Manage account) or a team's settings (Manage team), depending on how you want the application registered. It does not matter if the application is registered as an individual or a team - that is entirely up to you. 1. Select "OAuth" in the left menu. @@ -16,9 +16,17 @@ Bitbucket will generate an application ID and secret key for you to use. 1. Provide the required details. - Name: This can be anything. Consider something like `<Organization>'s GitLab` or `<Your Name>'s GitLab` or something else descriptive. - Application description: Fill this in if you wish. + - Callback URL: leave blank. - URL: The URL to your GitLab installation. 'https://gitlab.company.com' + +1. Grant at least the following permissions. + - Account: Email + - Repositories: Read + 1. Select "Save". +1. Select your newly created OAuth consumer. + 1. You should now see a Key and Secret in the list of OAuth customers. Keep this page open as you continue configuration. @@ -62,7 +70,7 @@ Bitbucket will generate an application ID and secret key for you to use. app_secret: 'YOUR_APP_SECRET' } ``` -1. Change 'YOUR_APP_ID' to the key from the Bitbucket application page from step 7. +1. Change 'YOUR_KEY' to the key from the Bitbucket application page from step 7. 1. Change 'YOUR_APP_SECRET' to the secret from the Bitbucket application page from step 7. @@ -137,4 +145,4 @@ To allow GitLab to connect to Bitbucket over SSH, you need to add 'bitbucket.org 1. Restart GitLab to allow it to find the new public key. -You should now see the "Import projects from Bitbucket" option on the New Project page enabled. +You should now see the "Import projects from Bitbucket" option on the New Project page enabled.
\ No newline at end of file |