Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/factories/milestones.rb b/spec/factories/milestones.rb
index 75ff925774a..32eee645f6a 100644
--- a/spec/factories/milestones.rb
+++ b/spec/factories/milestones.rb
@@ -9,7 +9,7 @@ FactoryBot.define do
       group { nil }
       project_id { nil }
       group_id { nil }
-      parent { nil }
+      resource_parent { nil }
     end
 
     trait :active do
@@ -34,9 +34,9 @@ FactoryBot.define do
         milestone.project = evaluator.project
       elsif evaluator.project_id
         milestone.project_id = evaluator.project_id
-      elsif evaluator.parent
-        id = evaluator.parent.id
-        evaluator.parent.is_a?(Group) ? evaluator.group_id = id : evaluator.project_id = id
+      elsif evaluator.resource_parent
+        id = evaluator.resource_parent.id
+        evaluator.resource_parent.is_a?(Group) ? evaluator.group_id = id : evaluator.project_id = id
       else
         milestone.project = create(:project)
       end