Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 8 deletions

diff --git a/lib/gitlab/import_export/project/object_builder.rb b/lib/gitlab/import_export/project/object_builder.rb
index 0962ad9f028..ac28ae6bfe0 100644
--- a/lib/gitlab/import_export/project/object_builder.rb
+++ b/lib/gitlab/import_export/project/object_builder.rb
@@ -60,7 +60,7 @@ module Gitlab
 
         def prepare_attributes
           attributes.dup.tap do |atts|
-            atts.delete('group') unless epic? || iteration?
+            atts.delete('group') unless group_level_object?
 
             if label?
               atts['type'] = 'ProjectLabel' # Always create project labels
@@ -142,10 +142,6 @@ module Gitlab
           klass == MergeRequestDiffCommit
         end
 
-        def iteration?
-          klass == Iteration
-        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:
@@ -164,7 +160,11 @@ module Gitlab
         end
 
         def group_relation_without_group?
-          (epic? || iteration?) && group.nil?
+          group_level_object? && group.nil?
+        end
+
+        def group_level_object?
+          epic?
         end
       end
     end
diff --git a/lib/gitlab/import_export/project/relation_tree_restorer.rb b/lib/gitlab/import_export/project/relation_tree_restorer.rb
index 47196db6f8a..b5247754199 100644
--- a/lib/gitlab/import_export/project/relation_tree_restorer.rb
+++ b/lib/gitlab/import_export/project/relation_tree_restorer.rb
@@ -5,10 +5,14 @@ module Gitlab
     module Project
       class RelationTreeRestorer < ImportExport::Group::RelationTreeRestorer
         # Relations which cannot be saved at project level (and have a group assigned)
-        GROUP_MODELS = [GroupLabel, Milestone, Epic, Iteration].freeze
+        GROUP_MODELS = [GroupLabel, Milestone, Epic].freeze
 
         private
 
+        def group_models
+          GROUP_MODELS
+        end
+
         def bulk_insert_enabled
           true
         end
@@ -19,9 +23,11 @@ module Gitlab
         end
 
         def relation_invalid_for_importable?(relation_object)
-          GROUP_MODELS.include?(relation_object.class) && relation_object.group_id
+          group_models.include?(relation_object.class) && relation_object.group_id
         end
       end
     end
   end
 end
+
+Gitlab::ImportExport::Project::RelationTreeRestorer.prepend_mod