summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-26 16:38:11 +0000
committerIan Baum <ibaum@gitlab.com>2018-01-29 12:12:06 -0600
commit44cb95a471031773190dd7912529df47e27a767b (patch)
tree79362e39ce1858fc29124db6f886ffca8d82ffd5 /changelogs
parentb404ea4b5e19643bc859cb1e3c282f834d46ea7e (diff)
downloadgitlab-ce-44cb95a471031773190dd7912529df47e27a767b.tar.gz
Merge branch '42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error' into 'master'
Resolve "Import from GitLab.com fails (destination already exists and is not an empty directory error)." Closes #42327 See merge request gitlab-org/gitlab-ce!16714
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error.yml b/changelogs/unreleased/42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error.yml
new file mode 100644
index 00000000000..660f4f5d42c
--- /dev/null
+++ b/changelogs/unreleased/42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error.yml
@@ -0,0 +1,6 @@
+---
+title: Fixes destination already exists, and some particular service errors on Import/Export
+ error
+merge_request: 16714
+author:
+type: fixed