Merge branch '220920-broken-master-in-spec-factories_spec-rb' into 'master'

[RUN AS-IF-FOSS] Resolve "Broken master in spec/factories_spec.rb"

Closes #220920

See merge request gitlab-org/gitlab!34165

ee/spec/factories/services.rb

@@ -12,4 +12,11 @@ FactoryBot.define do
     active { true }
     type { 'SlackSlashCommandsService' }
   end
+
+  factory :github_service do
+    project
+    type { 'GithubService' }
+    active { true }
+    token { 'github-token' }
+  end
 end

spec/factories/services.rb

@@ -165,13 +165,6 @@ FactoryBot.define do
     type { 'SlackService' }
   end
 
-  factory :github_service do
-    project
-    type { 'GithubService' }
-    active { true }
-    token { 'github-token' }
-  end
-
   factory :pipelines_email_service do
     project
     active { true }