add author on notes to export - so we can add to a note if project member is not found

lib/gitlab/import_export/import_export.yml

 # Model relationships to be included in the project import/export
 project_tree:
   - issues:
-    - :notes
+    - notes:
+        :author
   - :labels
   - :milestones
   - :snippets
@@ -10,8 +11,9 @@ project_tree:
   - project_members:
     - :user
   - merge_requests:
+    - notes:
+        :author
     - :merge_request_diff
-    - :notes
   - ci_commits:
     - :statuses
 
@@ -31,6 +33,8 @@ included_attributes:
     - :id
     - :email
     - :username
+  author:
+    - :name
 
 # Do not include the following attributes for the models specified.
 excluded_attributes:

lib/gitlab/import_export/import_export_reader.rb

@@ -37,10 +37,22 @@ module Gitlab
           @attributes_parser.parse(current_key) { |hash| @json_config_hash[current_key] ||= hash }
 
           handle_model_object(current_key, model_object)
+          process_sub_model(current_key, model_object) if model_object.is_a?(Hash)
         end
         @json_config_hash
       end
 
+      def process_sub_model(current_key, model_object)
+        sub_model_json = build_json_config_hash(model_object).dup
+        @json_config_hash.slice!(current_key)
+
+        if @json_config_hash[current_key] && @json_config_hash[current_key][:include]
+          @json_config_hash[current_key][:include] << sub_model_json
+        else
+          @json_config_hash[current_key] = { include: sub_model_json }
+        end
+      end
+
       def handle_model_object(current_key, model_object)
         if @json_config_hash[current_key]
           add_model_value(current_key, model_object)

spec/lib/gitlab/import_export/project_tree_saver_spec.rb

@@ -65,6 +65,10 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
         expect(saved_project_json['issues'].first['notes']).not_to be_empty
       end
 
+      it 'has author on issue comments' do
+        expect(saved_project_json['issues'].first['notes'].first['author']).not_to be_empty
+      end
+
       it 'has project members' do
         expect(saved_project_json['project_members']).not_to be_empty
       end
@@ -77,6 +81,9 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
         expect(saved_project_json['merge_requests'].first['notes']).not_to be_empty
       end
 
+      it 'has author on merge requests comments' do
+        expect(saved_project_json['merge_requests'].first['notes'].first['author']).not_to be_empty
+      end
       it 'has commit statuses' do
         expect(saved_project_json['ci_commits'].first['statuses']).not_to be_empty
       end