summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-06-25 07:56:05 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-06-25 07:56:05 +0000
commitdd71b5a22c9cdadabc33697f89e9bd5d87a36e09 (patch)
tree4515eb338b164750fe6209facba2eab1d67fca8a
parent1d45ee71811c64b86a292b32bd68fe46a39d20b7 (diff)
parenta8f6737df2c5d9a510da66c3224a12b63e3b6fc0 (diff)
downloadgitlab-ce-dd71b5a22c9cdadabc33697f89e9bd5d87a36e09.tar.gz
Merge branch '48260-change-the-bitbucket-import-page-to-indicate-that-its-for-bb-cloud-only-not-for-on-prem-bb' into 'master'
Resolve "Change the BitBucket import page to indicate that its for BB Cloud only, not for on-prem BB" Closes #48260 See merge request gitlab-org/gitlab-ce!20080
-rw-r--r--doc/user/project/import/bitbucket.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/user/project/import/bitbucket.md b/doc/user/project/import/bitbucket.md
index b22c7db0047..e3d625cc621 100644
--- a/doc/user/project/import/bitbucket.md
+++ b/doc/user/project/import/bitbucket.md
@@ -9,6 +9,10 @@ The [Bitbucket integration][bb-import] must be first enabled in order to be
able to import your projects from Bitbucket. Ask your GitLab administrator
to enable this if not already.
+>**Note:**
+The BitBucket importer currently only works with BitBucket's cloud offering
+(bitbucket.org) and does not work with BitBucket Server (aka Stash).
+
- At its current state, the Bitbucket importer can import:
- the repository description (GitLab 7.7+)
- the Git repository data (GitLab 7.7+)