summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-12-21 21:55:16 +0000
committerStan Hu <stanhu@gmail.com>2016-12-21 21:55:16 +0000
commitc7ee5742337c799e7a2bda0d74756b7e51770fca (patch)
treef6e2e76e70638a5e4c0bc2dfdaf45dcbd2136561 /doc
parent79a816f3bca839aadbaf7af92ac0c0d30dc8a8b7 (diff)
parentffe78adf040ac96e0763bdf556ce19ac966e480c (diff)
downloadgitlab-ce-c7ee5742337c799e7a2bda0d74756b7e51770fca.tar.gz
Merge branch 'update-bb-importer-docs' into 'master'
Update Bitbucket callback URL documentation Closes #25950 See merge request !8241
Diffstat (limited to 'doc')
-rw-r--r--doc/integration/bitbucket.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/integration/bitbucket.md b/doc/integration/bitbucket.md
index 1dfc985eaea..2a14c0397ca 100644
--- a/doc/integration/bitbucket.md
+++ b/doc/integration/bitbucket.md
@@ -40,9 +40,13 @@ you to use.
| :--- | :---------- |
| **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. |
+ | **Callback URL** | The URL to your GitLab installation, e.g., `https://gitlab.example.com`. |
| **URL** | The URL to your GitLab installation, e.g., `https://gitlab.example.com`. |
+ NOTE: Starting in GitLab 8.15, you MUST specify a callback URL, or you will
+ see an "Invalid redirect_uri" message. For more details, see [the
+ Bitbucket documentation](https://confluence.atlassian.com/bitbucket/oauth-faq-338365710.html).
+
And grant at least the following permissions:
```