summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2019-02-22 15:07:53 +0100
committerJames Lopez <james@jameslopez.es>2019-02-22 15:07:53 +0100
commitc643042a4912a20da54dc7bb4bb28452f6458573 (patch)
treec4c1d51ae2060beba4e7ec7e08314a306fd87735
parentb569e76c15af91d3cf953394428a50662287a16a (diff)
downloadgitlab-ce-c643042a4912a20da54dc7bb4bb28452f6458573.tar.gz
Fix project import error on releases
-rw-r--r--changelogs/unreleased/57712-project-import-error-user-expected-got-hash.yml5
-rw-r--r--lib/gitlab/import_export/import_export.yml1
-rw-r--r--spec/lib/gitlab/import_export/project_tree_saver_spec.rb8
3 files changed, 13 insertions, 1 deletions
diff --git a/changelogs/unreleased/57712-project-import-error-user-expected-got-hash.yml b/changelogs/unreleased/57712-project-import-error-user-expected-got-hash.yml
new file mode 100644
index 00000000000..6fb198e1552
--- /dev/null
+++ b/changelogs/unreleased/57712-project-import-error-user-expected-got-hash.yml
@@ -0,0 +1,5 @@
+---
+title: Fix project import error importing releases
+merge_request: 25495
+author:
+type: fixed
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 7f8c6d56627..fa54fc17d95 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -28,7 +28,6 @@ project_tree:
- notes:
:author
- releases:
- - :author
- :links
- project_members:
- :user
diff --git a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
index 46fdfba953b..cfc3e0ce926 100644
--- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
@@ -78,6 +78,14 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
expect(saved_project_json['releases']).not_to be_empty
end
+ it 'has no author on releases' do
+ expect(saved_project_json['releases'].first['author']).to be_nil
+ end
+
+ it 'has the author ID on releases' do
+ expect(saved_project_json['releases'].first['author_id']).not_to be_nil
+ end
+
it 'has issues' do
expect(saved_project_json['issues']).not_to be_empty
end