Merge branch 'fix/import-events' into 'master'

changelogs/unreleased/fix-import-events.yml

+---
+title: Fix events error importing GitLab projects
+merge_request:
+author:
+type: fixed

lib/gitlab/import_export/import_export.yml

@@ -135,3 +135,7 @@ methods:
     - :diff_head_sha
   project:
     - :description_html
+  events:
+    - :action
+  push_event_payload:
+    - :action
\ No newline at end of file

spec/lib/gitlab/import_export/project_tree_restorer_spec.rb

@@ -79,6 +79,10 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
           expect(event).not_to be_nil
         end
 
+        it 'has the action' do
+          expect(event.action).not_to be_nil
+        end
+
         it 'event belongs to note, belongs to merge request, belongs to a project' do
           expect(event.note.noteable.project).not_to be_nil
         end

spec/support/import_export/export_file_helper.rb

@@ -35,7 +35,8 @@ module ExportFileHelper
            project: project,
            commit_id: ci_pipeline.sha)
 
-    create(:event, :created, target: milestone, project: project, author: user)
+    event = create(:event, :created, target: milestone, project: project, author: user, action: 5)
+    create(:push_event_payload, event: event)
     create(:project_member, :master, user: user, project: project)
     create(:ci_variable, project: project)
     create(:ci_trigger, project: project)