Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 5 deletions

diff --git a/spec/factories/customer_relations/contacts.rb b/spec/factories/customer_relations/contacts.rb
index 1896510d362..6410e298bc3 100644
--- a/spec/factories/customer_relations/contacts.rb
+++ b/spec/factories/customer_relations/contacts.rb
@@ -8,10 +8,6 @@ FactoryBot.define do
     last_name { generate(:name) }
     email { generate(:email) }
 
-    trait :with_organization do
-      organization
-    end
-
     trait :inactive do
       state { :inactive }
     end
diff --git a/spec/factories/customer_relations/organizations.rb b/spec/factories/customer_relations/organizations.rb
index b6efd46f1a4..789099190ac 100644
--- a/spec/factories/customer_relations/organizations.rb
+++ b/spec/factories/customer_relations/organizations.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :organization, class: 'CustomerRelations::Organization' do
+  factory :crm_organization, class: 'CustomerRelations::Organization' do
     group
 
     name { generate(:name) }