Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/57712-project-import-error-user-expected-got-hash.yml

+---
+title: Fix project import error importing releases
+merge_request: 25495
+author:
+type: fixed

lib/gitlab/import_export/import_export.yml

@@ -28,7 +28,6 @@ project_tree:
     - notes:
         :author
   - releases:
-    - :author
     - :links
   - project_members:
     - :user

spec/lib/gitlab/import_export/project_tree_saver_spec.rb

@@ -82,6 +82,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