diff options
| author | Valery Sizov <valery@gitlab.com> | 2016-12-19 20:44:57 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2016-12-19 20:48:08 +0200 |
| commit | 5b0ebbe5b4c18c136aad2a53898c1a6441d39a9d (patch) | |
| tree | a984bf0c2ff5fa499ae66a01e266c1c04bec4799 /doc | |
| parent | 2c49c1af660a8e69446be442df81f9beaf0cf168 (diff) | |
| download | gitlab-ce-5b0ebbe5b4c18c136aad2a53898c1a6441d39a9d.tar.gz | |
Add Wiki import to BB importer
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/integration/bitbucket.md | 3 | ||||
| -rw-r--r-- | doc/integration/img/bitbucket_oauth_settings_page.png | bin | 5607 -> 28719 bytes | |||
| -rw-r--r-- | doc/workflow/importing/import_projects_from_bitbucket.md | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/doc/integration/bitbucket.md b/doc/integration/bitbucket.md index 5df6e103f42..1dfc985eaea 100644 --- a/doc/integration/bitbucket.md +++ b/doc/integration/bitbucket.md @@ -5,7 +5,7 @@ Bitbucket.org account. ## Overview -You can set up Bitbucket.org as an OAuth provider so that you can use your +You can set up Bitbucket.org as an OAuth2 provider so that you can use your credentials to authenticate into GitLab or import your projects from Bitbucket.org. @@ -50,6 +50,7 @@ you to use. Repositories: Read Pull Requests: Read Issues: Read + Wiki: Read and Write ```  diff --git a/doc/integration/img/bitbucket_oauth_settings_page.png b/doc/integration/img/bitbucket_oauth_settings_page.png Binary files differindex 21ce82a6074..3e6dea6cfe9 100644 --- a/doc/integration/img/bitbucket_oauth_settings_page.png +++ b/doc/integration/img/bitbucket_oauth_settings_page.png diff --git a/doc/workflow/importing/import_projects_from_bitbucket.md b/doc/workflow/importing/import_projects_from_bitbucket.md index b6d47e5afa2..97380bce172 100644 --- a/doc/workflow/importing/import_projects_from_bitbucket.md +++ b/doc/workflow/importing/import_projects_from_bitbucket.md @@ -17,6 +17,7 @@ to enable this if not already. - the pull requests (GitLab 8.4+)
- the pull request comments (GitLab 8.15+)
- the milestones (GitLab 8.15+)
+ - the wiki (GitLab 8.15+)
- References to pull requests and issues are preserved (GitLab 8.7+)
- Repository public access is retained. If a repository is private in Bitbucket
it will be created as private in GitLab as well.
|
