diff --git a/Gemfile b/Gemfile
index e9701fab27a218c7d607e81833988b935236989c..adfbb4cd5306601c6aedc6a2e8a814bd94a1dd1b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -311,7 +311,7 @@ group :development, :test do
   gem 'fuubar', '~> 2.2.0'
 
   gem 'database_cleaner', '~> 1.5.0'
-  gem 'factory_girl_rails', '~> 4.7.0'
+  gem 'factory_bot_rails', '~> 4.8.2'
   gem 'rspec-rails', '~> 3.6.0'
   gem 'rspec-retry', '~> 0.4.5'
   gem 'spinach-rails', '~> 0.2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index efae71efdb7849003fb822fb61e5153fc97a152c..5880193f7597c539c59cff9f23cd525429b4a3a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -195,10 +195,10 @@ GEM
     excon (0.57.1)
     execjs (2.6.0)
     expression_parser (0.9.0)
-    factory_girl (4.7.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
@@ -1017,7 +1017,7 @@ DEPENDENCIES
   dropzonejs-rails (~> 0.7.1)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 1.6.0)
-  factory_girl_rails (~> 4.7.0)
+  factory_bot_rails (~> 4.8.2)
   faraday (~> 0.12)
   ffaker (~> 2.4)
   flay (~> 2.8.0)
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 627cb2bd93cd7da51749f9060854dc845e11e3f1..5940fae8dd01e35070d7c96db4271ae9e617d836 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -11,7 +11,7 @@ class Projects::NotesController < Projects::ApplicationController
   # Controller actions are returned from AbstractController::Base and methods of parent classes are
   #   excluded in order to return only specific controller related methods.
   # That is ok for the app (no :create method in ancestors)
-  #   but fails for tests because there is a :create method on FactoryGirl (one of the ancestors)
+  #   but fails for tests because there is a :create method on FactoryBot (one of the ancestors)
   #
   # see https://github.com/rails/rails/blob/v4.2.7/actionpack/lib/abstract_controller/base.rb#L78
   #
diff --git a/config/application.rb b/config/application.rb
index 6436f887d14669c25b53031289c6e8e5628396d0..89a54987365573fd7d21838bfddad3b6c0887dc2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -159,7 +159,7 @@ module Gitlab
     config.middleware.insert_after ActionDispatch::Flash, 'Gitlab::Middleware::ReadOnly'
 
     config.generators do |g|
-      g.factory_girl false
+      g.factory_bot false
     end
 
     config.after_initialize do
diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb
index 96c6d954ff77fc618372fa8a90b3d8a866543626..d7be6f5950fb47dcf08e7823cdb739009013abfa 100644
--- a/db/fixtures/development/17_cycle_analytics.rb
+++ b/db/fixtures/development/17_cycle_analytics.rb
@@ -140,8 +140,8 @@ class Gitlab::Seeder::CycleAnalytics
         issue.update(milestone: @project.milestones.sample)
       else
         label_name = "#{FFaker::Product.brand}-#{FFaker::Product.brand}-#{rand(1000)}"
-        list_label = FactoryGirl.create(:label, title: label_name, project: issue.project)
-        FactoryGirl.create(:list, board: FactoryGirl.create(:board, project: issue.project), label: list_label)
+        list_label = FactoryBot.create(:label, title: label_name, project: issue.project)
+        FactoryBot.create(:list, board: FactoryBot.create(:board, project: issue.project), label: list_label)
         issue.update(labels: [list_label])
       end
 
diff --git a/doc/development/gotchas.md b/doc/development/gotchas.md
index c2ca8966a3f3fa517d4e4338b9e07bd63a85c91a..5786287d00cab301bb3cccfdd6bae240b1fc9539 100644
--- a/doc/development/gotchas.md
+++ b/doc/development/gotchas.md
@@ -8,7 +8,7 @@ might encounter or should avoid during development of GitLab CE and EE.
 Consider the following factory:
 
 ```ruby
-FactoryGirl.define do
+FactoryBot.define do
   factory :label do
     sequence(:title) { |n| "label#{n}" }
   end
@@ -53,7 +53,7 @@ When run, this spec doesn't do what we might expect:
      (compared using ==)
 ```
 
-That's because FactoryGirl sequences are not reseted for each example.
+That's because FactoryBot sequences are not reseted for each example.
 
 Please remember that sequence-generated values exist only to avoid having to
 explicitly set attributes that have a uniqueness constraint when using a factory.
diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md
index 8b7b015427ff5608467791363c618da72c2281aa..edb8f372ea3a3df78f2811634549f40de1251086 100644
--- a/doc/development/testing_guide/best_practices.md
+++ b/doc/development/testing_guide/best_practices.md
@@ -8,8 +8,8 @@ and effective _as well as_ fast.
 
 Here are some things to keep in mind regarding test performance:
 
-- `double` and `spy` are faster than `FactoryGirl.build(...)`
-- `FactoryGirl.build(...)` and `.build_stubbed` are faster than `.create`.
+- `double` and `spy` are faster than `FactoryBot.build(...)`
+- `FactoryBot.build(...)` and `.build_stubbed` are faster than `.create`.
 - Don't `create` an object when `build`, `build_stubbed`, `attributes_for`,
   `spy`, or `double` will do. Database persistence is slow!
 - Don't mark a feature as requiring JavaScript (through `@javascript` in
@@ -254,13 +254,13 @@ end
 
 ### Factories
 
-GitLab uses [factory_girl] as a test fixture replacement.
+GitLab uses [factory_bot] as a test fixture replacement.
 
 - Factory definitions live in `spec/factories/`, named using the pluralization
   of their corresponding model (`User` factories are defined in `users.rb`).
 - There should be only one top-level factory definition per file.
-- FactoryGirl methods are mixed in to all RSpec groups. This means you can (and
-  should) call `create(...)` instead of `FactoryGirl.create(...)`.
+- FactoryBot methods are mixed in to all RSpec groups. This means you can (and
+  should) call `create(...)` instead of `FactoryBot.create(...)`.
 - Make use of [traits] to clean up definitions and usages.
 - When defining a factory, don't define attributes that are not required for the
   resulting record to pass validation.
@@ -269,8 +269,8 @@ GitLab uses [factory_girl] as a test fixture replacement.
 - Factories don't have to be limited to `ActiveRecord` objects.
   [See example](https://gitlab.com/gitlab-org/gitlab-ce/commit/0b8cefd3b2385a21cfed779bd659978c0402766d).
 
-[factory_girl]: https://github.com/thoughtbot/factory_girl
-[traits]: http://www.rubydoc.info/gems/factory_girl/file/GETTING_STARTED.md#Traits
+[factory_bot]: https://github.com/thoughtbot/factory_bot
+[traits]: http://www.rubydoc.info/gems/factory_bot/file/GETTING_STARTED.md#Traits
 
 ### Fixtures
 
diff --git a/doc/development/testing_guide/index.md b/doc/development/testing_guide/index.md
index 8045bbad7ba34311f59f0156175320f7a3f3a2a5..65386f231a074b24731167deccb4db55997f0f45 100644
--- a/doc/development/testing_guide/index.md
+++ b/doc/development/testing_guide/index.md
@@ -33,7 +33,7 @@ changes should be tested.
 
 ## [Testing best practices](best_practices.md)
 
-Everything you should know about how to write good tests: RSpec, FactoryGirl,
+Everything you should know about how to write good tests: RSpec, FactoryBot,
 system tests, parameterized tests etc.
 
 ---
diff --git a/features/support/env.rb b/features/support/env.rb
index 5962745d5013ee8189395c9a3f396c9f50106e53..996bb8922e848057055720e54cdbd34a6c6c1a9c 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -27,7 +27,7 @@ Spinach.hooks.before_run do
   # web editor and merge
   TestEnv.disable_pre_receive
 
-  include FactoryGirl::Syntax::Methods
+  include FactoryBot::Syntax::Methods
   include GitlabRoutingHelper
 end
 
diff --git a/spec/factories/abuse_reports.rb b/spec/factories/abuse_reports.rb
index 8f6422a7825e00d726db935fc96b9cf59ea5722f..021971ac421b19fa1c052321cc7f051831c008c4 100644
--- a/spec/factories/abuse_reports.rb
+++ b/spec/factories/abuse_reports.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :abuse_report do
     reporter factory: :user
     user
diff --git a/spec/factories/appearances.rb b/spec/factories/appearances.rb
index 860973024c925b789923c3066950ab493a3ed665..5f9c57c0c8d28d679d29a2cce3375e754436496c 100644
--- a/spec/factories/appearances.rb
+++ b/spec/factories/appearances.rb
@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :appearance do
     title       "MepMep"
     description "This is my Community Edition instance"
diff --git a/spec/factories/application_settings.rb b/spec/factories/application_settings.rb
index aef65e724c280d0dba6cf6e43ae54bbb4144d5d6..3ecc90b65731c53b04e3ad75f58b851554025ae8 100644
--- a/spec/factories/application_settings.rb
+++ b/spec/factories/application_settings.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :application_setting do
   end
 end
diff --git a/spec/factories/award_emoji.rb b/spec/factories/award_emoji.rb
index 4b858df52c9bb9b82832b50b25984672022f0494..a0abbbce686168da937bfc65f0a791a256caf9a3 100644
--- a/spec/factories/award_emoji.rb
+++ b/spec/factories/award_emoji.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :award_emoji do
     name "thumbsup"
     user
diff --git a/spec/factories/boards.rb b/spec/factories/boards.rb
index 1ec042a6ab4f51bad1281c4fd9575e1866beb514..1e125237ae890e3c53a361ccb55813274563417c 100644
--- a/spec/factories/boards.rb
+++ b/spec/factories/boards.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :board do
     project
 
diff --git a/spec/factories/broadcast_messages.rb b/spec/factories/broadcast_messages.rb
index c2fdf89213a614377edc126ae36c5494cfcd4a24..9a65e7f8a3f2f60607159e5e489c7659208383f8 100644
--- a/spec/factories/broadcast_messages.rb
+++ b/spec/factories/broadcast_messages.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :broadcast_message do
     message "MyText"
     starts_at 1.day.ago
diff --git a/spec/factories/chat_names.rb b/spec/factories/chat_names.rb
index 9a0be1a4598d1707deb257414434275a054afa2c..56993e5da18142aa325ece7aae2688559f50bad3 100644
--- a/spec/factories/chat_names.rb
+++ b/spec/factories/chat_names.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :chat_name, class: ChatName do
     user factory: :user
     service factory: :service
diff --git a/spec/factories/chat_teams.rb b/spec/factories/chat_teams.rb
index ffedf69a69be034c1f8c1e917400117dfcb2b85a..d048c46d6b6ac74b31467e1f98438bc4ad33984d 100644
--- a/spec/factories/chat_teams.rb
+++ b/spec/factories/chat_teams.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :chat_team, class: ChatTeam do
     sequence(:team_id) { |n| "abcdefghijklm#{n}" }
     namespace factory: :group
diff --git a/spec/factories/ci/build_trace_section_names.rb b/spec/factories/ci/build_trace_section_names.rb
index 1c16225f0e5c3edbf3c06e628d5e94865228e52e..ce07e716dde308e69b7aa4f26805effe4b9e198f 100644
--- a/spec/factories/ci/build_trace_section_names.rb
+++ b/spec/factories/ci/build_trace_section_names.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_build_trace_section_name, class: Ci::BuildTraceSectionName do
     sequence(:name) { |n| "section_#{n}" }
     project factory: :project
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index c868525cbc029252ae7e80ddd554207351680b45..dc1d88c92dcc532dcfd9e362644b8df1a7950b05 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -1,6 +1,6 @@
 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_build, class: Ci::Build do
     name 'test'
     stage 'test'
diff --git a/spec/factories/ci/group_variables.rb b/spec/factories/ci/group_variables.rb
index 565ced9eb1a81c2ec9b3b156f0eb77ad5939839b..64716842b12503bb50fac621c6b7ace50cce6b3b 100644
--- a/spec/factories/ci/group_variables.rb
+++ b/spec/factories/ci/group_variables.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_group_variable, class: Ci::GroupVariable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'
diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb
index 538dc4228327b089bf9632db86961abc0580567a..46afba2953c24efddfe922f2f779afba7219bbf3 100644
--- a/spec/factories/ci/job_artifacts.rb
+++ b/spec/factories/ci/job_artifacts.rb
@@ -1,6 +1,6 @@
 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_job_artifact, class: Ci::JobArtifact do
     job factory: :ci_build
     file_type :archive
diff --git a/spec/factories/ci/pipeline_schedule.rb b/spec/factories/ci/pipeline_schedule.rb
index 564fef6833bdbdff93a26776dcc7796441e82edf..b2b798074294735753f9a677066f02b57c35c233 100644
--- a/spec/factories/ci/pipeline_schedule.rb
+++ b/spec/factories/ci/pipeline_schedule.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_pipeline_schedule, class: Ci::PipelineSchedule do
     cron '0 1 * * *'
     cron_timezone Gitlab::Ci::CronParser::VALID_SYNTAX_SAMPLE_TIME_ZONE
diff --git a/spec/factories/ci/pipeline_schedule_variables.rb b/spec/factories/ci/pipeline_schedule_variables.rb
index ca64d1aada0bcd7ef388d4c56f913f3c4738a36b..8d29118e310d737b71df45908897e043f6f5666c 100644
--- a/spec/factories/ci/pipeline_schedule_variables.rb
+++ b/spec/factories/ci/pipeline_schedule_variables.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_pipeline_schedule_variable, class: Ci::PipelineScheduleVariable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'
diff --git a/spec/factories/ci/pipeline_variables.rb b/spec/factories/ci/pipeline_variables.rb
index 7c1a7faec08bd2dc2df2c6cee747081ccc86fa6f..b18055d7b3a2d673487ca6d67b554762545de934 100644
--- a/spec/factories/ci/pipeline_variables.rb
+++ b/spec/factories/ci/pipeline_variables.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_pipeline_variable, class: Ci::PipelineVariable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index f994c2df8214a2eca44f3cf9b9ef9be3a3de4db1..51a767e5b93f04812d9cf9502d85ee54e7f843f3 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_empty_pipeline, class: Ci::Pipeline do
     source :push
     ref 'master'
diff --git a/spec/factories/ci/runner_projects.rb b/spec/factories/ci/runner_projects.rb
index fa76d0ecd8ce7ace6c777ff3742a78a42a733edc..f605e90ceed4b5649f1de50e0d7280fca69301b8 100644
--- a/spec/factories/ci/runner_projects.rb
+++ b/spec/factories/ci/runner_projects.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_runner_project, class: Ci::RunnerProject do
     runner factory: :ci_runner
     project
diff --git a/spec/factories/ci/runners.rb b/spec/factories/ci/runners.rb
index 88bb755d068660ca3a5e8594d8d49c42ad628459..34b8b246d0fc0bfbb83372073e72934225796254 100644
--- a/spec/factories/ci/runners.rb
+++ b/spec/factories/ci/runners.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_runner, class: Ci::Runner do
     sequence(:description) { |n| "My runner#{n}" }
 
diff --git a/spec/factories/ci/stages.rb b/spec/factories/ci/stages.rb
index b2ded94573808f43f293af5efd0cbe84d1c8d586..25309033571182abe0ef2131ef50956beb3acb23 100644
--- a/spec/factories/ci/stages.rb
+++ b/spec/factories/ci/stages.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_stage, class: Ci::LegacyStage do
     skip_create
 
diff --git a/spec/factories/ci/trigger_requests.rb b/spec/factories/ci/trigger_requests.rb
index 40b8848920ef7d40c4a02322f2a9fe840c8c4e68..0e9fc3d001436a24386ef8bfd8ebf39da64421ed 100644
--- a/spec/factories/ci/trigger_requests.rb
+++ b/spec/factories/ci/trigger_requests.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_trigger_request, class: Ci::TriggerRequest do
     trigger factory: :ci_trigger
   end
diff --git a/spec/factories/ci/triggers.rb b/spec/factories/ci/triggers.rb
index 3734c7040c036b8e22213847dbd9e193245ea35e..742d9efba2d6577ecd288f4641bcaafda7df15ce 100644
--- a/spec/factories/ci/triggers.rb
+++ b/spec/factories/ci/triggers.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_trigger_without_token, class: Ci::Trigger do
     owner
 
diff --git a/spec/factories/ci/variables.rb b/spec/factories/ci/variables.rb
index d8fd513ffcf15cd2633449551feeb637a2cf4ca7..3d014b9b54f7d3a1c3e00df3df9c9f5eb2269411 100644
--- a/spec/factories/ci/variables.rb
+++ b/spec/factories/ci/variables.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_variable, class: Ci::Variable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index fab37195113d88bc61ca8aae647f1360d4a32408..d82fa8e34aa1685659f8a98f268d9501955d04e8 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_applications_helm, class: Clusters::Applications::Helm do
     cluster factory: %i(cluster provided_by_gcp)
 
diff --git a/spec/factories/clusters/applications/ingress.rb b/spec/factories/clusters/applications/ingress.rb
index b103a9806555eac0a985a5ef1eb732bc8347afc8..85f54a9d744566af3e346d6dc4ab092dd7b6c6b8 100644
--- a/spec/factories/clusters/applications/ingress.rb
+++ b/spec/factories/clusters/applications/ingress.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_applications_ingress, class: Clusters::Applications::Ingress do
     cluster factory: %i(cluster provided_by_gcp)
 
diff --git a/spec/factories/clusters/clusters.rb b/spec/factories/clusters/clusters.rb
index 9e73a19e8563c8f93d01925a929e2cae87672122..20d5580f0c20797893d9111d19274b0df036422f 100644
--- a/spec/factories/clusters/clusters.rb
+++ b/spec/factories/clusters/clusters.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster, class: Clusters::Cluster do
     user
     name 'test-cluster'
diff --git a/spec/factories/clusters/platforms/kubernetes.rb b/spec/factories/clusters/platforms/kubernetes.rb
index 8b3e6ff35fafafec84b04e1c64e6b7d98d1d86a7..89f6ddebf6aa73d0eba2101c1a3bc617fe136fc6 100644
--- a/spec/factories/clusters/platforms/kubernetes.rb
+++ b/spec/factories/clusters/platforms/kubernetes.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_platform_kubernetes, class: Clusters::Platforms::Kubernetes do
     cluster
     namespace nil
diff --git a/spec/factories/clusters/providers/gcp.rb b/spec/factories/clusters/providers/gcp.rb
index a815410512a3298b4e75656cace5acade6d5c424..a002ab285197d89158f3b3678627a47c8cc3ffad 100644
--- a/spec/factories/clusters/providers/gcp.rb
+++ b/spec/factories/clusters/providers/gcp.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_provider_gcp, class: Clusters::Providers::Gcp do
     cluster
     gcp_project_id 'test-gcp-project'
diff --git a/spec/factories/commit_statuses.rb b/spec/factories/commit_statuses.rb
index abbe37df90efda910e5892250cb9b2a3d4fec152..ce5fbc343ee217009e12ede1718314b811ed45b9 100644
--- a/spec/factories/commit_statuses.rb
+++ b/spec/factories/commit_statuses.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :commit_status, class: CommitStatus do
     name 'default'
     stage 'test'
diff --git a/spec/factories/commits.rb b/spec/factories/commits.rb
index 4e2d8e8969eef8dc18deae54397a4522ab9dbbed..84a8bc56640ae34683083732f5c3b10da4a21267 100644
--- a/spec/factories/commits.rb
+++ b/spec/factories/commits.rb
@@ -1,6 +1,6 @@
 require_relative '../support/repo_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :commit do
     transient do
       author nil
diff --git a/spec/factories/container_repositories.rb b/spec/factories/container_repositories.rb
index 3fcad9fd4b3a3493c3a9cbaea2d12c9eb0249fb0..62a89a12ef5512c09a7d7acb7eebb2bc95b5b6de 100644
--- a/spec/factories/container_repositories.rb
+++ b/spec/factories/container_repositories.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :container_repository do
     name 'test_container_image'
     project
diff --git a/spec/factories/conversational_development_index_metrics.rb b/spec/factories/conversational_development_index_metrics.rb
index 3806c43ba15dc515d688d73f059a059a32801c7f..abf37fb861eea77c518f4aaee27faab5706e1e2c 100644
--- a/spec/factories/conversational_development_index_metrics.rb
+++ b/spec/factories/conversational_development_index_metrics.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :conversational_development_index_metric, class: ConversationalDevelopmentIndex::Metric do
     leader_issues 9.256
     instance_issues 1.234
diff --git a/spec/factories/deploy_keys_projects.rb b/spec/factories/deploy_keys_projects.rb
index 27cece487bd87924574545ffda60d6946b6c19bd..30a6d468ed365cf82af66cfd8325af8d9c438fa3 100644
--- a/spec/factories/deploy_keys_projects.rb
+++ b/spec/factories/deploy_keys_projects.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :deploy_keys_project do
     deploy_key
     project
diff --git a/spec/factories/deployments.rb b/spec/factories/deployments.rb
index 0dd1238d6e26f7b906760555275d4cb7241c24b3..9d7d5e566118281f88a1a9c9af0072938c0a158c 100644
--- a/spec/factories/deployments.rb
+++ b/spec/factories/deployments.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :deployment, class: Deployment do
     sha '97de212e80737a608d939f648d959671fb0a0142'
     ref 'master'
diff --git a/spec/factories/emails.rb b/spec/factories/emails.rb
index c9ab87a15aaa06e5f1a9509741f2f336a7e5e5a5..4dc7961060a11eba223e8f89934c849e69ce6992 100644
--- a/spec/factories/emails.rb
+++ b/spec/factories/emails.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :email do
     user
     email { generate(:email_alias) }
diff --git a/spec/factories/environments.rb b/spec/factories/environments.rb
index 9034476d094358937e5579e2468ee84c7eb76a99..b5db57d5148a5db758fe39608e0144b0ea581614 100644
--- a/spec/factories/environments.rb
+++ b/spec/factories/environments.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :environment, class: Environment do
     sequence(:name) { |n| "environment#{n}" }
 
diff --git a/spec/factories/events.rb b/spec/factories/events.rb
index ad9f7e2caefbe1e4bd3600323dc54a2d7d501163..ed275243ac96a287056fb43e0e471c1b42935474 100644
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :event do
     project
     author factory: :user
diff --git a/spec/factories/file_uploaders.rb b/spec/factories/file_uploaders.rb
index 622571390d22cb5baf8aee5699b81570e158c0d7..8404985bfeaff6b263dfa54148fc6ccb608883e7 100644
--- a/spec/factories/file_uploaders.rb
+++ b/spec/factories/file_uploaders.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :file_uploader do
     skip_create
 
diff --git a/spec/factories/fork_network_members.rb b/spec/factories/fork_network_members.rb
index 509c4e1fa1cfadb583e243af370254f634bfd6ce..850e3f158f128d09fe4f439573d33c9f55c7097b 100644
--- a/spec/factories/fork_network_members.rb
+++ b/spec/factories/fork_network_members.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :fork_network_member do
     association :project
     association :fork_network
diff --git a/spec/factories/fork_networks.rb b/spec/factories/fork_networks.rb
index f42d36f3d19df5bb049cb6f9dea0c5e33d46d869..813b1943eb29249b7df6c894a9b8a847783c55dd 100644
--- a/spec/factories/fork_networks.rb
+++ b/spec/factories/fork_networks.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :fork_network do
     association :root_project, factory: :project
   end
diff --git a/spec/factories/forked_project_links.rb b/spec/factories/forked_project_links.rb
index 9b34651a4ae3f1a117b969e77751d14f905c1198..bc59fea81ec70f8cb75876d356920bbb686e6552 100644
--- a/spec/factories/forked_project_links.rb
+++ b/spec/factories/forked_project_links.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :forked_project_link do
     association :forked_to_project, factory: [:project, :repository]
     association :forked_from_project, factory: [:project, :repository]
diff --git a/spec/factories/gitaly/commit.rb b/spec/factories/gitaly/commit.rb
index e7966cee77bd6291a64903ed7be87a8ed2f65005..5034c3d0e4884c52d594ae2177aa162c242a9d1d 100644
--- a/spec/factories/gitaly/commit.rb
+++ b/spec/factories/gitaly/commit.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:gitaly_commit_id) { Digest::SHA1.hexdigest(Time.now.to_f.to_s) }
 
   factory :gitaly_commit, class: Gitaly::GitCommit do
diff --git a/spec/factories/gitaly/commit_author.rb b/spec/factories/gitaly/commit_author.rb
index 341873a2002d6a836ce5ff39da316a2b73530167..aaf634ce08bec224de01c5c18c67a4e6148fd8fd 100644
--- a/spec/factories/gitaly/commit_author.rb
+++ b/spec/factories/gitaly/commit_author.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :gitaly_commit_author, class: Gitaly::CommitAuthor do
     skip_create
 
diff --git a/spec/factories/gpg_key_subkeys.rb b/spec/factories/gpg_key_subkeys.rb
index 66ecb44d84b9fe78a63e5991eddeeb3e65c41d15..57eaaee345fded45ffdffb6a4429a8e5ba994b2c 100644
--- a/spec/factories/gpg_key_subkeys.rb
+++ b/spec/factories/gpg_key_subkeys.rb
@@ -1,6 +1,6 @@
 require_relative '../support/gpg_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :gpg_key_subkey do
     gpg_key
 
diff --git a/spec/factories/gpg_keys.rb b/spec/factories/gpg_keys.rb
index 93218e5763e7d4e83720cf30dcbc6e91796c84f0..b8aabf7422170e5d6228f9b2b0e9b5e0e178f13a 100644
--- a/spec/factories/gpg_keys.rb
+++ b/spec/factories/gpg_keys.rb
@@ -1,6 +1,6 @@
 require_relative '../support/gpg_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :gpg_key do
     key GpgHelpers::User1.public_key
     user
diff --git a/spec/factories/gpg_signature.rb b/spec/factories/gpg_signature.rb
index e9798ff6a41ce62c3b6d47fcc4da983d152fc0be..4620caff82354b11f466d9eeac56802f7aa38b6b 100644
--- a/spec/factories/gpg_signature.rb
+++ b/spec/factories/gpg_signature.rb
@@ -1,6 +1,6 @@
 require_relative '../support/gpg_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :gpg_signature do
     commit_sha { Digest::SHA1.hexdigest(SecureRandom.hex) }
     project
diff --git a/spec/factories/group_custom_attributes.rb b/spec/factories/group_custom_attributes.rb
index 7ff5f376e8b7e3dc01879bb4239e18d75787bf4d..d2f45d5d3cea2981f620923718738977a9cc8196 100644
--- a/spec/factories/group_custom_attributes.rb
+++ b/spec/factories/group_custom_attributes.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :group_custom_attribute do
     group
     sequence(:key) { |n| "key#{n}" }
diff --git a/spec/factories/group_members.rb b/spec/factories/group_members.rb
index 32cbfe28a602268ff89f07a84bc5faf621791bf8..1c2214e94819cafaccd39698e713504e4d86744d 100644
--- a/spec/factories/group_members.rb
+++ b/spec/factories/group_members.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :group_member do
     access_level { GroupMember::OWNER }
     group
diff --git a/spec/factories/groups.rb b/spec/factories/groups.rb
index 52f76b094a3995c01b5eecb0b7dfad1ab0eb5029..1512f5a0e58ef8c1649f59be89f9e3d47ca2a3c7 100644
--- a/spec/factories/groups.rb
+++ b/spec/factories/groups.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :group, class: Group, parent: :namespace do
     sequence(:name) { |n| "group#{n}" }
     path { name.downcase.gsub(/\s/, '_') }
diff --git a/spec/factories/identities.rb b/spec/factories/identities.rb
index 26ef6f18698cf41eebd8fc2646acb671506679d7..122d0d4293801e007a1c58f38579a85d0eccbf67 100644
--- a/spec/factories/identities.rb
+++ b/spec/factories/identities.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :identity do
     provider 'ldapmain'
     extern_uid 'my-ldap-id'
diff --git a/spec/factories/instance_configuration.rb b/spec/factories/instance_configuration.rb
index 406c7c3caf16b86f00b61bc9f12d5ffdc0818370..31866a9c221777c348ffd11450eb5e319b1b4843 100644
--- a/spec/factories/instance_configuration.rb
+++ b/spec/factories/instance_configuration.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :instance_configuration do
     skip_create
   end
diff --git a/spec/factories/issues.rb b/spec/factories/issues.rb
index 7c3b80198f9e67bdf95e5b8368fc741dfb57139e..5ed6b017dee0aa6a4c1d1069e37d31c21467c072 100644
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :issue do
     title { generate(:title) }
     author
diff --git a/spec/factories/keys.rb b/spec/factories/keys.rb
index 3f7c794b14a790bf2b2b278ea00e3a84746231fe..e6eb76f71d3fa29736046e04b515dca84edc508c 100644
--- a/spec/factories/keys.rb
+++ b/spec/factories/keys.rb
@@ -1,6 +1,6 @@
 require_relative '../support/helpers/key_generator_helper'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :key do
     title
     key { Spec::Support::Helpers::KeyGeneratorHelper.new(1024).generate + ' dummy@gitlab.com' }
diff --git a/spec/factories/label_links.rb b/spec/factories/label_links.rb
index 3580174e873f55b91de69dea81272044494a88d4..007847d9cf4f7e725f35f51aef0d0c8b534ea927 100644
--- a/spec/factories/label_links.rb
+++ b/spec/factories/label_links.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :label_link do
     label
     target factory: :issue
diff --git a/spec/factories/label_priorities.rb b/spec/factories/label_priorities.rb
index 7430466fc574c01ef651222dbd8bb7e0ae46363e..c4824faad5331fdc8270c12597011bef5fdc1a50 100644
--- a/spec/factories/label_priorities.rb
+++ b/spec/factories/label_priorities.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :label_priority do
     project
     label
diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb
index 416317d677be10f6c8321adb3979124f8ba76f78..f759b6d499d09f5b7af1d1409064fd76d2e51662 100644
--- a/spec/factories/labels.rb
+++ b/spec/factories/labels.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   trait :base_label do
     title { generate(:label_title) }
     color "#990000"
diff --git a/spec/factories/lfs_objects.rb b/spec/factories/lfs_objects.rb
index 477fab9e964d8c145e48e1032ac74541dbf64dd6..8eb709022ce97d23ea7c0e9fc24612b41b20eb5a 100644
--- a/spec/factories/lfs_objects.rb
+++ b/spec/factories/lfs_objects.rb
@@ -1,6 +1,6 @@
 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :lfs_object do
     sequence(:oid) { |n| "b68143e6463773b1b6c6fd009a76c32aeec041faff32ba2ed42fd7f708a%05x" % n }
     size 499013
diff --git a/spec/factories/lfs_objects_projects.rb b/spec/factories/lfs_objects_projects.rb
index 1ed0355c8e4fcba1a2fd278ecba40a2c93eb41bf..c225387a5de856fde611d9dc356b5c29e01f58a8 100644
--- a/spec/factories/lfs_objects_projects.rb
+++ b/spec/factories/lfs_objects_projects.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :lfs_objects_project do
     lfs_object
     project
diff --git a/spec/factories/lists.rb b/spec/factories/lists.rb
index 48142d3c49be365f9cb594dde82580c46410e015..210c58b21e94e073d0169ec1a2c0d0f64a55a25e 100644
--- a/spec/factories/lists.rb
+++ b/spec/factories/lists.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :list do
     board
     label
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index cc6cef63b47b8b58947e807f2f166fc1f95dcf80..40558c88d154f04604ab23f1eae8f1baa3a15c9d 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :merge_request do
     title { generate(:title) }
     author
diff --git a/spec/factories/merge_requests_closing_issues.rb b/spec/factories/merge_requests_closing_issues.rb
index fdbdc00cad73a316246b3ba0ce762f5e5f357676..ee0606a72b65471aa5bc7f1e761ca6457620516d 100644
--- a/spec/factories/merge_requests_closing_issues.rb
+++ b/spec/factories/merge_requests_closing_issues.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :merge_requests_closing_issues do
     issue
     merge_request
diff --git a/spec/factories/milestones.rb b/spec/factories/milestones.rb
index b5298b2f969f596f8966607920a3a8d5a1a5708d..f95632e7187f5b23ee1c92a869a5192c33c44759 100644
--- a/spec/factories/milestones.rb
+++ b/spec/factories/milestones.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :milestone do
     title
 
diff --git a/spec/factories/namespaces.rb b/spec/factories/namespaces.rb
index 1b1fc4ce80d65a8e4e3638149fdabd46f522d3c8..f94b09cff15d6bfa44a905944a67e0962277db03 100644
--- a/spec/factories/namespaces.rb
+++ b/spec/factories/namespaces.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :namespace do
     sequence(:name) { |n| "namespace#{n}" }
     path { name.downcase.gsub(/\s/, '_') }
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 471bfb3213a7b20c97f671da1728a9198c7bdc63..707ecbd6be55014e3ad4271cadeac69dd34211c2 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -2,7 +2,7 @@ require_relative '../support/repo_helpers'
 
 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :note do
     project
     note { generate(:title) }
diff --git a/spec/factories/notification_settings.rb b/spec/factories/notification_settings.rb
index e9171528d86dc3582c41cb35952e79637a3f2c20..5116ef33f5d9a0e51ca5ebbdae777b67c9f1712e 100644
--- a/spec/factories/notification_settings.rb
+++ b/spec/factories/notification_settings.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :notification_setting do
     source factory: :project
     user
diff --git a/spec/factories/oauth_access_grants.rb b/spec/factories/oauth_access_grants.rb
index 543b3e992742577e12bbd914397e383a53e9e35b..9e6af24c4ebdf88ed50a634101fff9831d612c0a 100644
--- a/spec/factories/oauth_access_grants.rb
+++ b/spec/factories/oauth_access_grants.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :oauth_access_grant do
     resource_owner_id { create(:user).id }
     application
diff --git a/spec/factories/oauth_access_tokens.rb b/spec/factories/oauth_access_tokens.rb
index a46bc1d8ce89992fa0d59c4300d5493afa63115c..eabfd6cd83031443c239a89a011911856ce4ed95 100644
--- a/spec/factories/oauth_access_tokens.rb
+++ b/spec/factories/oauth_access_tokens.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :oauth_access_token do
     resource_owner
     application
diff --git a/spec/factories/oauth_applications.rb b/spec/factories/oauth_applications.rb
index c7ede40f2409d194a6cacfd152bb06415cb0214f..4427da1d6c7b42d30f636220ec9c99baa21adc34 100644
--- a/spec/factories/oauth_applications.rb
+++ b/spec/factories/oauth_applications.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :oauth_application, class: 'Doorkeeper::Application', aliases: [:application] do
     sequence(:name) { |n| "OAuth App #{n}" }
     uid { Doorkeeper::OAuth::Helpers::UniqueToken.generate }
diff --git a/spec/factories/pages_domains.rb b/spec/factories/pages_domains.rb
index 6d2e45f41ba2ee10b9171b5731c00dac02ad40f0..61b04708da29ed843511c76d2bac3afc44dc1653 100644
--- a/spec/factories/pages_domains.rb
+++ b/spec/factories/pages_domains.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :pages_domain, class: 'PagesDomain' do
     domain 'my.domain.com'
 
diff --git a/spec/factories/personal_access_tokens.rb b/spec/factories/personal_access_tokens.rb
index 06acaff6cd02776896b63e74d411f772a14c55c6..1b12f84d7b8b4f38b3bb6254c2fec9d77d284177 100644
--- a/spec/factories/personal_access_tokens.rb
+++ b/spec/factories/personal_access_tokens.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :personal_access_token do
     user
     token { SecureRandom.hex(50) }
diff --git a/spec/factories/project_auto_devops.rb b/spec/factories/project_auto_devops.rb
index 8d124dc23815c86b212fdd3a213f3abcbc8c2f0f..5ce1988c76f1ac30aeb3301745f70241686552f7 100644
--- a/spec/factories/project_auto_devops.rb
+++ b/spec/factories/project_auto_devops.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :project_auto_devops do
     project
     enabled true
diff --git a/spec/factories/project_custom_attributes.rb b/spec/factories/project_custom_attributes.rb
index 5eedeb86304995c7b79b14c5629e5732b3557516..099d2d7ff19d3b04ebf8d24c695629e0c93a25b3 100644
--- a/spec/factories/project_custom_attributes.rb
+++ b/spec/factories/project_custom_attributes.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :project_custom_attribute do
     project
     sequence(:key) { |n| "key#{n}" }
diff --git a/spec/factories/project_group_links.rb b/spec/factories/project_group_links.rb
index e73cc05f9d7c0ada3af25d5ce1dc4ad0cfdf186d..d5ace9425a0d3bb6cec09f595764ad64fb301860 100644
--- a/spec/factories/project_group_links.rb
+++ b/spec/factories/project_group_links.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :project_group_link do
     project
     group
diff --git a/spec/factories/project_hooks.rb b/spec/factories/project_hooks.rb
index accae636a3a92ca986f1ace88548424abd839296..493b7bc021ca3080f0e3f8515932dd30e1f2449d 100644
--- a/spec/factories/project_hooks.rb
+++ b/spec/factories/project_hooks.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :project_hook do
     url { generate(:url) }
     enable_ssl_verification false
diff --git a/spec/factories/project_members.rb b/spec/factories/project_members.rb
index 9cf3a1e8e8a4caccce6d6b76577199b0fcefdbe7..4260f52498dd58a00a4cb5bdfe647ad19c7c7775 100644
--- a/spec/factories/project_members.rb
+++ b/spec/factories/project_members.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :project_member do
     user
     project
diff --git a/spec/factories/project_statistics.rb b/spec/factories/project_statistics.rb
index 6c2ed7c65815fbb707c09514ed5fd18d2ecfd09f..2d0f698475d3013a2def77c13f50288f1035aaf3 100644
--- a/spec/factories/project_statistics.rb
+++ b/spec/factories/project_statistics.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :project_statistics do
     project
 
diff --git a/spec/factories/project_wikis.rb b/spec/factories/project_wikis.rb
index 38fcab7466df207b083b9626b295177fa8fc3970..89d8248f9f40da8ebdc1466b15895945658cb06e 100644
--- a/spec/factories/project_wikis.rb
+++ b/spec/factories/project_wikis.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :project_wiki do
     skip_create
 
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 4034e7905adb72d6778df5520361eac023e9a754..d0f3911f730109e78e50baae234b68a44e7219b1 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -1,6 +1,6 @@
 require_relative '../support/test_env'
 
-FactoryGirl.define do
+FactoryBot.define do
   # Project without repository
   #
   # Project does not have bare repository.
diff --git a/spec/factories/protected_branches.rb b/spec/factories/protected_branches.rb
index fe0cbfc44447f5f3877afa771b7d7b854b6829d0..39460834d06cf49621ebe149bdf8d4339df75e4c 100644
--- a/spec/factories/protected_branches.rb
+++ b/spec/factories/protected_branches.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :protected_branch do
     name
     project
diff --git a/spec/factories/protected_tags.rb b/spec/factories/protected_tags.rb
index 225588b23cc07e03630f11a592e1b4ef1a1b08ae..df9c8b3cb6345e81018b4bd97c02a37a76984700 100644
--- a/spec/factories/protected_tags.rb
+++ b/spec/factories/protected_tags.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :protected_tag do
     name
     project
diff --git a/spec/factories/releases.rb b/spec/factories/releases.rb
index 74497dc82c030bb3744ef144784910c767b8609c..d80c65cf8bb48bb58d89ad5d119b317cd1749d4a 100644
--- a/spec/factories/releases.rb
+++ b/spec/factories/releases.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :release do
     tag "v1.1.0"
     description "Awesome release"
diff --git a/spec/factories/sent_notifications.rb b/spec/factories/sent_notifications.rb
index c2febf5b4382a750e6a65a9fa8c49b5d98dee5e2..8087206723389184200a6952c0af856a8b3a40e5 100644
--- a/spec/factories/sent_notifications.rb
+++ b/spec/factories/sent_notifications.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :sent_notification do
     project
     recipient factory: :user
diff --git a/spec/factories/sequences.rb b/spec/factories/sequences.rb
index c0232ba5bf689de5b54c36ed1906c8457429240a..f2b6e7a11f99df5a41045439ce9ab6b8b7990700 100644
--- a/spec/factories/sequences.rb
+++ b/spec/factories/sequences.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:username) { |n| "user#{n}" }
   sequence(:name) { |n| "John Doe#{n}" }
   sequence(:email) { |n| "user#{n}@example.org" }
diff --git a/spec/factories/service_hooks.rb b/spec/factories/service_hooks.rb
index e3f88ab8fcc3d184660ac4514e7a83386cc6c6a8..c907862b4f6c373e1c0ffcac90d6b970e412811c 100644
--- a/spec/factories/service_hooks.rb
+++ b/spec/factories/service_hooks.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :service_hook do
     url { generate(:url) }
     service
diff --git a/spec/factories/services.rb b/spec/factories/services.rb
index ccf63f3ffa4d254141f4177765831e5852ef0d1f..4b0377967c7ff3f793300c7357242f2668d77a51 100644
--- a/spec/factories/services.rb
+++ b/spec/factories/services.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :service do
     project
     type 'Service'
diff --git a/spec/factories/snippets.rb b/spec/factories/snippets.rb
index 075bccd7f945242690db831a7e670f6e49b5becb..2ab9a56d2557f5d454dea6b61632eefb8847887f 100644
--- a/spec/factories/snippets.rb
+++ b/spec/factories/snippets.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :snippet do
     author
     title { generate(:title) }
diff --git a/spec/factories/spam_logs.rb b/spec/factories/spam_logs.rb
index e369f9f13e9d0c42ea913cefc6707e981266af1c..a467f850a80515e6eda5c40bcd62da2cdafb3b4d 100644
--- a/spec/factories/spam_logs.rb
+++ b/spec/factories/spam_logs.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :spam_log do
     user
     sequence(:source_ip) { |n| "42.42.42.#{n % 255}" }
diff --git a/spec/factories/subscriptions.rb b/spec/factories/subscriptions.rb
index 1ae7fc9f384bb2b20afcd1c589d2031f70fa86b1..a4bc4e87b0ad682cde96697fcec5c21f693bdbfd 100644
--- a/spec/factories/subscriptions.rb
+++ b/spec/factories/subscriptions.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :subscription do
     user
     project
diff --git a/spec/factories/system_hooks.rb b/spec/factories/system_hooks.rb
index 841e1e293e8679fe8d3ee5ab4a1054a1c39c59bb..9e00eeb6ef1f8d8cd742d94c9d865f962c534288 100644
--- a/spec/factories/system_hooks.rb
+++ b/spec/factories/system_hooks.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :system_hook do
     url { generate(:url) }
   end
diff --git a/spec/factories/system_note_metadata.rb b/spec/factories/system_note_metadata.rb
index f487a2d7e4ae9eb2b1c1551861fe4bdd2d2689a6..e913068da40fa8b87cc18a1b43dd3a1079a2eaf2 100644
--- a/spec/factories/system_note_metadata.rb
+++ b/spec/factories/system_note_metadata.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :system_note_metadata do
     note
     action 'merge'
diff --git a/spec/factories/timelogs.rb b/spec/factories/timelogs.rb
index 6f1545418eb44862cc5914eccf4d17258b9c2da0..af34b0681e2e19783d4f48b4979a5090bb66b18c 100644
--- a/spec/factories/timelogs.rb
+++ b/spec/factories/timelogs.rb
@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :timelog do
     time_spent 3600
     user
diff --git a/spec/factories/todos.rb b/spec/factories/todos.rb
index 4975befbfe397e56e426c6d40e84cdfafc48386e..6a6de665dd1fd6c739e6ecf6c6bae71612b9f9ba 100644
--- a/spec/factories/todos.rb
+++ b/spec/factories/todos.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :todo do
     project
     author
diff --git a/spec/factories/trending_project.rb b/spec/factories/trending_project.rb
index 246176611dc42eb47dc71ba11b9c0ad616924047..f7c634fd21fbafe95f1e00368d8f10496f2c4831 100644
--- a/spec/factories/trending_project.rb
+++ b/spec/factories/trending_project.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   # TrendingProject
   factory :trending_project, class: 'TrendingProject' do
     project
diff --git a/spec/factories/u2f_registrations.rb b/spec/factories/u2f_registrations.rb
index df92b0795814e9a8e58c82353a2b66a29974a623..26090b08966c80b7e1bf2856716b3e220baed55d 100644
--- a/spec/factories/u2f_registrations.rb
+++ b/spec/factories/u2f_registrations.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :u2f_registration do
     certificate { FFaker::BaconIpsum.characters(728) }
     key_handle { FFaker::BaconIpsum.characters(86) }
diff --git a/spec/factories/uploads.rb b/spec/factories/uploads.rb
index e18f1a6bd4a108336a9e9d32b2550c9ab105cd52..c39500faea1a810ccbdd5f517c7a76362b749d39 100644
--- a/spec/factories/uploads.rb
+++ b/spec/factories/uploads.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :upload do
     model { build(:project) }
     path { "uploads/-/system/project/avatar/avatar.jpg" }
diff --git a/spec/factories/user_agent_details.rb b/spec/factories/user_agent_details.rb
index 9763cc0cf15d37d6b493b836c88b946cfd463a1a..7183a8e114070156a73a6625281c7b3c0b8fcbcc 100644
--- a/spec/factories/user_agent_details.rb
+++ b/spec/factories/user_agent_details.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_agent_detail do
     ip_address '127.0.0.1'
     user_agent 'AppleWebKit/537.36'
diff --git a/spec/factories/user_custom_attributes.rb b/spec/factories/user_custom_attributes.rb
index 278cf290d4f5479640a496555159b8ed8e8a26d9..a184a2e0f1702662ab189cc7dff146520d4033c4 100644
--- a/spec/factories/user_custom_attributes.rb
+++ b/spec/factories/user_custom_attributes.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_custom_attribute do
     user
     sequence(:key) { |n| "key#{n}" }
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 8ace424f8afaa098658730280a25a13fecc06ebd..e62e0b263ca08b3db72e2a4f1ff5fdb198c50c68 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user, aliases: [:author, :assignee, :recipient, :owner, :resource_owner] do
     email { generate(:email) }
     name { generate(:name) }
diff --git a/spec/factories/web_hook_log.rb b/spec/factories/web_hook_log.rb
index 230b3f6b26e35ec21efe1fe03e0dfba7709c6e8f..17837260a4b65fd70267958e86dfb05a01e08c37 100644
--- a/spec/factories/web_hook_log.rb
+++ b/spec/factories/web_hook_log.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :web_hook_log do
     web_hook factory: :project_hook
     trigger 'push_hooks'
diff --git a/spec/factories/wiki_directories.rb b/spec/factories/wiki_directories.rb
index 3b4cfc380b810677d5fc5461541ba1ca8d67d131..b105c82b19d450d92fcc98beff7da58fddfa4a0d 100644
--- a/spec/factories/wiki_directories.rb
+++ b/spec/factories/wiki_directories.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :wiki_directory do
     skip_create
 
diff --git a/spec/factories/wiki_pages.rb b/spec/factories/wiki_pages.rb
index 4105f59e289089af836f8d9a4878a76d46959cb3..2335b5118ddf474c89323bf2cb357319044242b9 100644
--- a/spec/factories/wiki_pages.rb
+++ b/spec/factories/wiki_pages.rb
@@ -1,6 +1,6 @@
 require 'ostruct'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :wiki_page do
     transient do
       attrs do
diff --git a/spec/factories_spec.rb b/spec/factories_spec.rb
index 09b3c0b0994a83fb21c1ca769aef7b785a9de136..66b71d0f5568c8528bc4335e3089be18f2e2060b 100644
--- a/spec/factories_spec.rb
+++ b/spec/factories_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'factories' do
-  FactoryGirl.factories.each do |factory|
+  FactoryBot.factories.each do |factory|
     describe "#{factory.name} factory" do
       it 'does not raise error when built' do
         expect { build(factory.name) }.not_to raise_error
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index e3bb16af38aaa9ee045917d250ec75e818f0b3d4..c1c54177167cd6e1a034970da3087bb8851d6528 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -13,8 +13,8 @@ describe "Admin Runners" do
 
     context "when there are runners" do
       before do
-        runner = FactoryGirl.create(:ci_runner, contacted_at: Time.now)
-        FactoryGirl.create(:ci_build, pipeline: pipeline, runner_id: runner.id)
+        runner = FactoryBot.create(:ci_runner, contacted_at: Time.now)
+        FactoryBot.create(:ci_build, pipeline: pipeline, runner_id: runner.id)
         visit admin_runners_path
       end
 
@@ -25,8 +25,8 @@ describe "Admin Runners" do
 
       describe 'search' do
         before do
-          FactoryGirl.create :ci_runner, description: 'runner-foo'
-          FactoryGirl.create :ci_runner, description: 'runner-bar'
+          FactoryBot.create :ci_runner, description: 'runner-foo'
+          FactoryBot.create :ci_runner, description: 'runner-bar'
         end
 
         it 'shows correct runner when description matches' do
@@ -62,11 +62,11 @@ describe "Admin Runners" do
   end
 
   describe "Runner show page" do
-    let(:runner) { FactoryGirl.create :ci_runner }
+    let(:runner) { FactoryBot.create :ci_runner }
 
     before do
-      @project1 = FactoryGirl.create(:project)
-      @project2 = FactoryGirl.create(:project)
+      @project1 = FactoryBot.create(:project)
+      @project2 = FactoryBot.create(:project)
       visit admin_runner_path(runner)
     end
 
diff --git a/spec/helpers/runners_helper_spec.rb b/spec/helpers/runners_helper_spec.rb
index 35f91b7decfde61701c8567d40bcf2fba7499a98..a4a483e68a899f3e2afd963f7c335f0d4eae4660 100644
--- a/spec/helpers/runners_helper_spec.rb
+++ b/spec/helpers/runners_helper_spec.rb
@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe RunnersHelper do
   it "returns - not contacted yet" do
-    runner = FactoryGirl.build :ci_runner
+    runner = FactoryBot.build :ci_runner
     expect(runner_status_icon(runner)).to include("not connected yet")
   end
 
   it "returns offline text" do
-    runner = FactoryGirl.build(:ci_runner, contacted_at: 1.day.ago, active: true)
+    runner = FactoryBot.build(:ci_runner, contacted_at: 1.day.ago, active: true)
     expect(runner_status_icon(runner)).to include("Runner is offline")
   end
 
   it "returns online text" do
-    runner = FactoryGirl.build(:ci_runner, contacted_at: 1.second.ago, active: true)
+    runner = FactoryBot.build(:ci_runner, contacted_at: 1.second.ago, active: true)
     expect(runner_status_icon(runner)).to include("Runner is online")
   end
 end
diff --git a/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb b/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb
index 3998ca940a4dc18c6019b38db6d8ccd19cf70131..7351d45336a21430edfd3282a9f61e2297f52985 100644
--- a/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb
+++ b/spec/lib/gitlab/background_migration/migrate_events_to_push_event_payloads_spec.rb
@@ -228,7 +228,7 @@ describe Gitlab::BackgroundMigration::MigrateEventsToPushEventPayloads, :migrati
   let(:projects) { table(:projects) }
   let(:project) { projects.create(namespace_id: namespace.id, creator_id: author.id) }
 
-  # We can not rely on FactoryGirl as the state of Event may change in ways that
+  # We can not rely on FactoryBot as the state of Event may change in ways that
   # the background migration does not expect, hence we use the Event class of
   # the migration itself.
   def create_push_event(project, author, data = nil)
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index bb89e09389008c16eb9bb3b2d111963b57ad6c08..856e17b20bde24556d1acd72109974d338104747 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -116,7 +116,7 @@ describe Ci::Pipeline, :mailer do
     end
 
     it "calculates average when there is one build without coverage" do
-      FactoryGirl.create(:ci_build, pipeline: pipeline)
+      FactoryBot.create(:ci_build, pipeline: pipeline)
       expect(pipeline.coverage).to be_nil
     end
   end
@@ -435,7 +435,7 @@ describe Ci::Pipeline, :mailer do
 
     describe 'merge request metrics' do
       let(:project) { create(:project, :repository) }
-      let(:pipeline) { FactoryGirl.create(:ci_empty_pipeline, status: 'created', project: project, ref: 'master', sha: project.repository.commit('master').id) }
+      let(:pipeline) { FactoryBot.create(:ci_empty_pipeline, status: 'created', project: project, ref: 'master', sha: project.repository.commit('master').id) }
       let!(:merge_request) { create(:merge_request, source_project: project, source_branch: pipeline.ref) }
 
       before do
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index a93e7e233a81b524454037e8e268307dd7a65193..b2b64e6ff482e67ddb0ec08068ad2ec6c743ce57 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -51,24 +51,24 @@ describe Ci::Runner do
 
   describe '#display_name' do
     it 'returns the description if it has a value' do
-      runner = FactoryGirl.build(:ci_runner, description: 'Linux/Ruby-1.9.3-p448')
+      runner = FactoryBot.build(:ci_runner, description: 'Linux/Ruby-1.9.3-p448')
       expect(runner.display_name).to eq 'Linux/Ruby-1.9.3-p448'
     end
 
     it 'returns the token if it does not have a description' do
-      runner = FactoryGirl.create(:ci_runner)
+      runner = FactoryBot.create(:ci_runner)
       expect(runner.display_name).to eq runner.description
     end
 
     it 'returns the token if the description is an empty string' do
-      runner = FactoryGirl.build(:ci_runner, description: '', token: 'token')
+      runner = FactoryBot.build(:ci_runner, description: '', token: 'token')
       expect(runner.display_name).to eq runner.token
     end
   end
 
   describe '#assign_to' do
-    let!(:project) { FactoryGirl.create :project }
-    let!(:shared_runner) { FactoryGirl.create(:ci_runner, :shared) }
+    let!(:project) { FactoryBot.create :project }
+    let!(:shared_runner) { FactoryBot.create(:ci_runner, :shared) }
 
     before do
       shared_runner.assign_to(project)
@@ -83,15 +83,15 @@ describe Ci::Runner do
     subject { described_class.online }
 
     before do
-      @runner1 = FactoryGirl.create(:ci_runner, :shared, contacted_at: 1.year.ago)
-      @runner2 = FactoryGirl.create(:ci_runner, :shared, contacted_at: 1.second.ago)
+      @runner1 = FactoryBot.create(:ci_runner, :shared, contacted_at: 1.year.ago)
+      @runner2 = FactoryBot.create(:ci_runner, :shared, contacted_at: 1.second.ago)
     end
 
     it { is_expected.to eq([@runner2])}
   end
 
   describe '#online?' do
-    let(:runner) { FactoryGirl.create(:ci_runner, :shared) }
+    let(:runner) { FactoryBot.create(:ci_runner, :shared) }
 
     subject { runner.online? }
 
@@ -268,7 +268,7 @@ describe Ci::Runner do
   end
 
   describe '#status' do
-    let(:runner) { FactoryGirl.create(:ci_runner, :shared, contacted_at: 1.second.ago) }
+    let(:runner) { FactoryBot.create(:ci_runner, :shared, contacted_at: 1.second.ago) }
 
     subject { runner.status }
 
@@ -442,9 +442,9 @@ describe Ci::Runner do
 
   describe "belongs_to_one_project?" do
     it "returns false if there are two projects runner assigned to" do
-      runner = FactoryGirl.create(:ci_runner)
-      project = FactoryGirl.create(:project)
-      project1 = FactoryGirl.create(:project)
+      runner = FactoryBot.create(:ci_runner)
+      project = FactoryBot.create(:project)
+      project1 = FactoryBot.create(:project)
       project.runners << runner
       project1.runners << runner
 
@@ -452,8 +452,8 @@ describe Ci::Runner do
     end
 
     it "returns true" do
-      runner = FactoryGirl.create(:ci_runner)
-      project = FactoryGirl.create(:project)
+      runner = FactoryBot.create(:ci_runner)
+      project = FactoryBot.create(:project)
       project.runners << runner
 
       expect(runner.belongs_to_one_project?).to be_truthy
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index c5708e70ef9ddec0688d5d89e366d43f4660d216..ba8aa13d5adf37e23f0a38ab8babf1675dfc9fc4 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -126,7 +126,7 @@ describe Deployment do
     subject { deployment.stop_action }
 
     context 'when no other actions' do
-      let(:deployment) { FactoryGirl.build(:deployment, deployable: build) }
+      let(:deployment) { FactoryBot.build(:deployment, deployable: build) }
 
       it { is_expected.to be_nil }
     end
@@ -135,13 +135,13 @@ describe Deployment do
       let!(:close_action) { create(:ci_build, :manual, pipeline: build.pipeline, name: 'close_app') }
 
       context 'when matching action is defined' do
-        let(:deployment) { FactoryGirl.build(:deployment, deployable: build, on_stop: 'close_other_app') }
+        let(:deployment) { FactoryBot.build(:deployment, deployable: build, on_stop: 'close_other_app') }
 
         it { is_expected.to be_nil }
       end
 
       context 'when no matching action is defined' do
-        let(:deployment) { FactoryGirl.build(:deployment, deployable: build, on_stop: 'close_app') }
+        let(:deployment) { FactoryBot.build(:deployment, deployable: build, on_stop: 'close_app') }
 
         it { is_expected.to eq(close_action) }
       end
@@ -159,7 +159,7 @@ describe Deployment do
 
     context 'when matching action is defined' do
       let(:build) { create(:ci_build) }
-      let(:deployment) { FactoryGirl.build(:deployment, deployable: build, on_stop: 'close_app') }
+      let(:deployment) { FactoryBot.build(:deployment, deployable: build, on_stop: 'close_app') }
       let!(:close_action) { create(:ci_build, :manual, pipeline: build.pipeline, name: 'close_app') }
 
       it { is_expected.to be_truthy }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index dd9e849851920d77660f4179c4a32cf9074fb7e5..f805f2dcddbb3dfe0494a5c99d173e586ddf06d8 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -289,12 +289,12 @@ describe Project do
 
   describe 'project token' do
     it 'sets an random token if none provided' do
-      project = FactoryGirl.create :project, runners_token: ''
+      project = FactoryBot.create :project, runners_token: ''
       expect(project.runners_token).not_to eq('')
     end
 
     it 'does not set an random token if one provided' do
-      project = FactoryGirl.create :project, runners_token: 'my-token'
+      project = FactoryBot.create :project, runners_token: 'my-token'
       expect(project.runners_token).to eq('my-token')
     end
   end
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb
index de8a9ce12ff06eceb374930cf58792cdd90b26e0..97a563c1ce11e941bd970d9d5fbc4d2da1435638 100644
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -2,11 +2,11 @@ require 'spec_helper'
 
 module Ci
   describe RegisterJobService do
-    let!(:project) { FactoryGirl.create :project, shared_runners_enabled: false }
-    let!(:pipeline) { FactoryGirl.create :ci_pipeline, project: project }
-    let!(:pending_job) { FactoryGirl.create :ci_build, pipeline: pipeline }
-    let!(:shared_runner) { FactoryGirl.create(:ci_runner, is_shared: true) }
-    let!(:specific_runner) { FactoryGirl.create(:ci_runner, is_shared: false) }
+    let!(:project) { FactoryBot.create :project, shared_runners_enabled: false }
+    let!(:pipeline) { FactoryBot.create :ci_pipeline, project: project }
+    let!(:pending_job) { FactoryBot.create :ci_build, pipeline: pipeline }
+    let!(:shared_runner) { FactoryBot.create(:ci_runner, is_shared: true) }
+    let!(:specific_runner) { FactoryBot.create(:ci_runner, is_shared: false) }
 
     before do
       specific_runner.assign_to(project)
@@ -74,11 +74,11 @@ module Ci
           let!(:project3) { create :project, shared_runners_enabled: true }
           let!(:pipeline3) { create :ci_pipeline, project: project3 }
           let!(:build1_project1) { pending_job }
-          let!(:build2_project1) { FactoryGirl.create :ci_build, pipeline: pipeline }
-          let!(:build3_project1) { FactoryGirl.create :ci_build, pipeline: pipeline }
-          let!(:build1_project2) { FactoryGirl.create :ci_build, pipeline: pipeline2 }
-          let!(:build2_project2) { FactoryGirl.create :ci_build, pipeline: pipeline2 }
-          let!(:build1_project3) { FactoryGirl.create :ci_build, pipeline: pipeline3 }
+          let!(:build2_project1) { FactoryBot.create :ci_build, pipeline: pipeline }
+          let!(:build3_project1) { FactoryBot.create :ci_build, pipeline: pipeline }
+          let!(:build1_project2) { FactoryBot.create :ci_build, pipeline: pipeline2 }
+          let!(:build2_project2) { FactoryBot.create :ci_build, pipeline: pipeline2 }
+          let!(:build1_project3) { FactoryBot.create :ci_build, pipeline: pipeline3 }
 
           it 'prefers projects without builds first' do
             # it gets for one build from each of the projects
diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb
index d48a44fa57f576c8648f96fa21f8f02ca87cb24c..a06397a07822d6a9e8cf6d86f30d5d3b04207d49 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -40,7 +40,7 @@ describe Ci::RetryBuildService do
              description: 'my-job', stage: 'test',  pipeline: pipeline,
              auto_canceled_by: create(:ci_empty_pipeline, project: project)) do |build|
                ##
-               # TODO, workaround for FactoryGirl limitation when having both
+               # TODO, workaround for FactoryBot limitation when having both
                # stage (text) and stage_id (integer) columns in the table.
                build.stage_id = stage.id
              end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f94fb8733d55d42c7b81448f293b59bfc81db9e3..f51bb44086b8b1b8dbb04f53b404183035375454 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -183,7 +183,7 @@ RSpec::Matchers.define :match_asset_path do |expected|
   end
 end
 
-FactoryGirl::SyntaxRunner.class_eval do
+FactoryBot::SyntaxRunner.class_eval do
   include RSpec::Mocks::ExampleMethods
 end
 
diff --git a/spec/support/factory_girl.rb b/spec/support/factory_girl.rb
index eec437fb3aa75a4fcb9c82e6ce1b8da96d804924..c7890e49c6657fbbe5e573fc59faed6cd9d716e6 100644
--- a/spec/support/factory_girl.rb
+++ b/spec/support/factory_girl.rb
@@ -1,3 +1,3 @@
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 end
diff --git a/spec/support/markdown_feature.rb b/spec/support/markdown_feature.rb
index c90359d7cfa2da86ffe2ef45ed0a7fe3862aa9f4..a0d854d3641f18c2c4ee299bdc845b9759b5b777 100644
--- a/spec/support/markdown_feature.rb
+++ b/spec/support/markdown_feature.rb
@@ -8,7 +8,7 @@
 # The class renders `spec/fixtures/markdown.md.erb` using ERB, allowing for
 # reference to the factory-created objects.
 class MarkdownFeature
-  include FactoryGirl::Syntax::Methods
+  include FactoryBot::Syntax::Methods
 
   def user
     @user ||= create(:user)
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index b300b493f865596f92479c925b4d34309c257438..ffc051a3fff203f34389d68ffe6fa990f2c3534b 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -82,10 +82,10 @@ module TestEnv
 
     setup_gitaly
 
-    # Create repository for FactoryGirl.create(:project)
+    # Create repository for FactoryBot.create(:project)
     setup_factory_repo
 
-    # Create repository for FactoryGirl.create(:forked_project_with_submodules)
+    # Create repository for FactoryBot.create(:forked_project_with_submodules)
     setup_forked_repo
   end
 
diff --git a/spec/uploaders/records_uploads_spec.rb b/spec/uploaders/records_uploads_spec.rb
index bb32ee62ccbea901beb968a5f11965359cbe2b98..7ef7fb7d758b8228c04d60eef18c562bc3d1ce84 100644
--- a/spec/uploaders/records_uploads_spec.rb
+++ b/spec/uploaders/records_uploads_spec.rb
@@ -8,7 +8,7 @@ describe RecordsUploads do
       storage :file
 
       def model
-        FactoryGirl.build_stubbed(:user)
+        FactoryBot.build_stubbed(:user)
       end
     end
 
diff --git a/spec/views/projects/jobs/show.html.haml_spec.rb b/spec/views/projects/jobs/show.html.haml_spec.rb
index 6139529013fcddb3dad06718d2bc14065f0ab221..6a67da79ec585fa13375531a37d6fbd82596a94e 100644
--- a/spec/views/projects/jobs/show.html.haml_spec.rb
+++ b/spec/views/projects/jobs/show.html.haml_spec.rb
@@ -187,7 +187,7 @@ describe 'projects/jobs/show' do
 
   context 'when incomplete trigger_request is used' do
     before do
-      build.trigger_request = FactoryGirl.build(:ci_trigger_request, trigger: nil)
+      build.trigger_request = FactoryBot.build(:ci_trigger_request, trigger: nil)
     end
 
     it 'test should not render token block' do
@@ -199,7 +199,7 @@ describe 'projects/jobs/show' do
 
   context 'when complete trigger_request is used' do
     before do
-      build.trigger_request = FactoryGirl.build(:ci_trigger_request)
+      build.trigger_request = FactoryBot.build(:ci_trigger_request)
     end
 
     it 'should render token' do