Merge branches 'feature/project-export' and 'feature/project-import' of...

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

app/services/projects/import_export.rb

@@ -11,11 +11,15 @@ module Projects
     end
 
     def project_tree
-      %i(project_members issues merge_requests labels milestones snippets releases events commit_statuses)
+      %i(issues merge_requests labels milestones snippets releases events commit_statuses) + members
     end
 
     private
 
+    def members
+      [{ project_members: { include: [user: { only: [:email, :username] }] } }]
+    end
+
     def storage_path
       File.join(Settings.shared['path'], 'tmp/project_exports')
     end