Add latest changes from gitlab-org/gitlab@master

4 files changed, 34 insertions, 13 deletions

diff --git a/lib/gitlab/import_export/group_project_object_builder.rb b/lib/gitlab/import_export/group_project_object_builder.rb
index b94839363df..2e7ab3d4b69 100644
--- a/lib/gitlab/import_export/group_project_object_builder.rb
+++ b/lib/gitlab/import_export/group_project_object_builder.rb
@@ -26,6 +26,8 @@ module Gitlab
       end
 
       def find
+        return if epic? && group.nil?
+
         find_object || klass.create(project_attributes)
       end
 
@@ -54,10 +56,10 @@ module Gitlab
       # or, if group is present:
       # `"{table_name}"."project_id" = {project.id} OR "{table_name}"."group_id" = {group.id}`
       def where_clause_base
-        clause = table[:project_id].eq(project.id) if project
-        clause = clause.or(table[:group_id].eq(group.id)) if group
-
-        clause
+        [].tap do |clauses|
+          clauses << table[:project_id].eq(project.id) if project
+          clauses << table[:group_id].eq(group.id) if group
+        end.reduce(:or)
       end
 
       # Returns Arel clause `"{table_name}"."title" = '{attributes['title']}'`
@@ -108,6 +110,10 @@ module Gitlab
         klass == MergeRequest
       end
 
+      def epic?
+        klass == Epic
+      end
+
       # If an existing group milestone used the IID
       # claim the IID back and set the group milestone to use one available
       # This is necessary to fix situations like the following:
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 3208e6648a7..0f0397ec13b 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -322,6 +322,13 @@ excluded_attributes:
     - :board_id
     - :label_id
     - :milestone_id
+  epic:
+    - :start_date_sourcing_milestone_id
+    - :due_date_sourcing_milestone_id
+    - :parent_id
+    - :state_id
+    - :start_date_sourcing_epic_id
+    - :due_date_sourcing_epic_id
 methods:
   notes:
     - :type
@@ -374,6 +381,7 @@ ee:
         - design_versions:
           - actions:
             - :design # Duplicate export of issues.designs in order to link the record to both Issue and Action
+        - :epic
       - protected_branches:
         - :unprotect_access_levels
       - protected_environments:
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 9dd30803196..9a5e01462fb 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -40,7 +40,21 @@ module Gitlab
 
       IMPORTED_OBJECT_MAX_RETRIES = 5.freeze
 
-      EXISTING_OBJECT_CHECK = %i[milestone milestones label labels project_label project_labels group_label group_labels project_feature merge_request ProjectCiCdSetting container_expiration_policy].freeze
+      EXISTING_OBJECT_CHECK = %i[
+        milestone
+        milestones
+        label
+        labels
+        project_label
+        project_labels
+        group_label
+        group_labels
+        project_feature
+        merge_request
+        epic
+        ProjectCiCdSetting
+        container_expiration_policy
+      ].freeze
 
       TOKEN_RESET_MODELS = %i[Project Namespace Ci::Trigger Ci::Build Ci::Runner ProjectHook].freeze
 
@@ -86,9 +100,6 @@ module Gitlab
       def create
         return if unknown_service?
 
-        # Do not import legacy triggers
-        return if !Feature.enabled?(:use_legacy_pipeline_triggers, @project) && legacy_trigger?
-
         setup_models
 
         object = generate_imported_object
@@ -345,10 +356,6 @@ module Gitlab
           !Object.const_defined?(parsed_relation_hash['type'])
       end
 
-      def legacy_trigger?
-        @relation_name == :'Ci::Trigger' && @relation_hash['owner_id'].nil?
-      end
-
       def find_or_create_object!
         if UNIQUE_RELATIONS.include?(@relation_name)
           unique_relation_object = relation_class.find_or_create_by(project_id: @project.id)
diff --git a/lib/gitlab/import_export/relation_tree_restorer.rb b/lib/gitlab/import_export/relation_tree_restorer.rb
index 886087bc73a..4f58406360e 100644
--- a/lib/gitlab/import_export/relation_tree_restorer.rb
+++ b/lib/gitlab/import_export/relation_tree_restorer.rb
@@ -4,7 +4,7 @@ module Gitlab
   module ImportExport
     class RelationTreeRestorer
       # Relations which cannot be saved at project level (and have a group assigned)
-      GROUP_MODELS = [GroupLabel, Milestone].freeze
+      GROUP_MODELS = [GroupLabel, Milestone, Epic].freeze
 
       attr_reader :user
       attr_reader :shared