From 80f61b4035607d7cd87de993b8f5e996bde3481f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 18 Sep 2019 14:02:45 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/project/import/bitbucket_server.md | 2 +- doc/user/project/import/manifest.md | 2 +- doc/user/project/import/phabricator.md | 2 +- doc/user/project/import/svn.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/user/project/import') diff --git a/doc/user/project/import/bitbucket_server.md b/doc/user/project/import/bitbucket_server.md index 28e211ee2ba..7f2c6005cd4 100644 --- a/doc/user/project/import/bitbucket_server.md +++ b/doc/user/project/import/bitbucket_server.md @@ -1,6 +1,6 @@ # Import your project from Bitbucket Server to GitLab -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20164) +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/20164) in GitLab 11.2. NOTE: **Note:** diff --git a/doc/user/project/import/manifest.md b/doc/user/project/import/manifest.md index 161a4163e42..86c8b276887 100644 --- a/doc/user/project/import/manifest.md +++ b/doc/user/project/import/manifest.md @@ -1,6 +1,6 @@ # Import multiple repositories by uploading a manifest file -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/28811) in GitLab 11.2. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/28811) in GitLab 11.2. GitLab allows you to import all the required Git repositories based on a manifest file like the one used by the diff --git a/doc/user/project/import/phabricator.md b/doc/user/project/import/phabricator.md index b8f89caba24..5015c5390de 100644 --- a/doc/user/project/import/phabricator.md +++ b/doc/user/project/import/phabricator.md @@ -1,6 +1,6 @@ # Import Phabricator tasks into a GitLab project -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/60562) in +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/60562) in GitLab 12.0. GitLab allows you to import all tasks from a Phabricator instance into diff --git a/doc/user/project/import/svn.md b/doc/user/project/import/svn.md index d175ee87f26..267dca5bf4d 100644 --- a/doc/user/project/import/svn.md +++ b/doc/user/project/import/svn.md @@ -101,7 +101,7 @@ Running SubGit in a mirror mode requires a source, academic and startup projects. We're currently working on deeper GitLab/SubGit integration. You may track our -progress at [this issue](https://gitlab.com/gitlab-org/gitlab-ee/issues/990). +progress at [this issue](https://gitlab.com/gitlab-org/gitlab/issues/990). ### SubGit support -- cgit v1.2.3