diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-02-25 13:41:28 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-02-25 13:41:28 +0000 |
| commit | 27ed9d958ad939d08d2457e1e64061c5e4f402e4 (patch) | |
| tree | ac06f10b59698bb16bee204f26002cefb0aeee05 | |
| parent | 992183534dd1af54bf891789aca5777ea91c0942 (diff) | |
| parent | c643042a4912a20da54dc7bb4bb28452f6458573 (diff) | |
| download | gitlab-ce-27ed9d958ad939d08d2457e1e64061c5e4f402e4.tar.gz | |
Merge branch '57712-project-import-error-user-expected-got-hash' into 'master'
Resolve "Project import error, User expected, got Hash"
Closes #57712
See merge request gitlab-org/gitlab-ce!25495
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 |