Merge branch 'master' into ce-to-ee-2017-12-14

Gemfile

@@ -323,7 +323,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'

Gemfile.lock

@@ -216,10 +216,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)
@@ -1054,7 +1054,7 @@ DEPENDENCIES
   elasticsearch-rails (~> 0.1.9)
   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)
   faraday_middleware-aws-signers-v4
   ffaker (~> 2.4)

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
   #

app/views/help/index.html.haml

 %div
-- if current_application_settings.help_text.present?
-  = markdown(current_application_settings.help_text)
+- if current_application_settings.help_page_text.present?
+  = markdown(current_application_settings.help_page_text)
   %hr
 
 - unless current_application_settings.help_page_hide_commercial_content?

config/application.rb

@@ -180,7 +180,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

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
 

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.

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
 

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.
 
 ---

doc/security/README.md

@@ -14,3 +14,4 @@ comments: false
 - [How we manage the CRIME vulnerability](crime_vulnerability.md)
 - [Enforce Two-factor authentication](two_factor_authentication.md)
 - [Send email confirmation on sign-up](user_email_confirmation.md)
+- [Security of running jobs](https://docs.gitlab.com/runner/security/#security-of-running-jobs)

doc/workflow/lfs/migrate_from_git_annex_to_git_lfs.md

@@ -43,7 +43,9 @@ Annex to Git LFS.
 
 If you know what you are doing and want to skip the reading, this is what you
 need to do (we assume you have [git-annex enabled][annex-gitlab-use] in your
-repository). Fire up a terminal, navigate to your Git repository and:
+repository and that you have made backups in case something goes wrong).
+Fire up a terminal, navigate to your Git repository and:
+
 
 1. Disable `git-annex`:
 
@@ -57,6 +59,7 @@ repository). Fire up a terminal, navigate to your Git repository and:
 1. Enable `git-lfs`:
 
     ```
+    git lfs install
     git lfs track <files>
     git add .
     git commit -m "commit message"
@@ -81,9 +84,22 @@ deprecated in Git Annex version 6, so you may need to upgrade your repository
 if the server also has Git Annex 6 installed. Read more in the
 [Git Annex troubleshooting tips][annex-tips] section.
 
+1. Backup your repository
+
+    ```bash
+    cd repository
+    git annex sync --content
+    cd ..
+    git clone repository repository-backup
+    cd repository-backup
+    git annex get
+    cd ..
+    ```
+
 1. Use `annex direct`:
 
     ```bash
+    cd repository
     git annex direct
     ```
 
@@ -198,6 +214,17 @@ branches created by Git Annex: `git-annex`, and all under `synced/`.
 
 ![repository branches](images/git-annex-branches.png)
 
+You can also do this on the commandline with:
+
+    ```bash
+    git branch -d synced/master
+    git branch -d synced/git-annex
+    git push origin :synced/master
+    git push origin :synced/git-annex
+    git push origin :git-annex
+    git remote prune origin
+    ```
+
 If there are still some Annex objects inside your repository (`.git/annex/`)
 or references inside `.git/config`, run `annex uninit` again:
 

ee/app/views/projects/ee/_service_desk_settings.html.haml

@@ -8,7 +8,7 @@
         = expanded ? 'Collapse' : 'Expand'
       %p
         Customize your service desk settings.
-        = link_to "Learn more about service desk.", help_page_path('user/project/service_desk')
+        = link_to "Learn more about service desk.", help_page_path('user/project/service_desk'), target: '_blank'
     .settings-content
       - if EE::Gitlab::ServiceDesk.enabled?(project: @project)
         .js-service-desk-setting-root{ data: { endpoint: project_service_desk_path(@project),

features/support/env.rb

@@ -35,7 +35,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
 

spec/ee/spec/lib/gitlab/geo/jwt_request_decoder_spec.rb

 require 'spec_helper'
 
 describe Gitlab::Geo::JwtRequestDecoder do
-  let!(:primary_node) { FactoryGirl.create(:geo_node, :primary) }
+  let!(:primary_node) { FactoryBot.create(:geo_node, :primary) }
   let(:data) { { input: 123 } }
   let(:request) { Gitlab::Geo::TransferRequest.new(data) }
 

spec/ee/spec/lib/gitlab/geo/oauth_session_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe Gitlab::Geo::OauthSession do
   subject { described_class.new }
-  let(:oauth_app) { FactoryGirl.create(:doorkeeper_application) }
+  let(:oauth_app) { FactoryBot.create(:doorkeeper_application) }
   let(:oauth_return_to) { 'http://localhost:3000/oauth/geo/callback' }
   let(:dummy_state) { 'salt:hmac:return_to' }
   let(:valid_state) { described_class.new(return_to: oauth_return_to).generate_oauth_state }
-  let(:access_token) { FactoryGirl.create(:doorkeeper_access_token).token }
-  let(:user) { FactoryGirl.build(:user) }
+  let(:access_token) { FactoryBot.create(:doorkeeper_access_token).token }
+  let(:user) { FactoryBot.build(:user) }
 
   before do
     allow(subject).to receive(:oauth_app) { oauth_app }

spec/ee/spec/models/geo_node_spec.rb

@@ -63,7 +63,7 @@ describe GeoNode, type: :model do
   end
 
   context 'cache expiration' do
-    let(:new_node) { FactoryGirl.build(:geo_node) }
+    let(:new_node) { FactoryBot.build(:geo_node) }
 
     it 'expires cache when saved' do
       expect(new_node).to receive(:expire_cache!).at_least(:once)

spec/factories/abuse_reports.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :abuse_report do
     reporter factory: :user
     user

spec/factories/appearances.rb

-# 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 "GitLab Enterprise Edition"
     description "Open source software to collaborate on code"

spec/factories/application_settings.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :application_setting do
   end
 end

spec/factories/approvals.rb

-# 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 :approval do
     merge_request
     user

spec/factories/approver_groups.rb

-# 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 :approver_group do
     target factory: :merge_request
     group

spec/factories/approvers.rb

-# 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 :approver do
     target factory: :merge_request
     user

spec/factories/audit_events.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :audit_event, aliases: [:user_audit_event] do
     user
     type 'SecurityEvent'

spec/factories/award_emoji.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :award_emoji do
     name "thumbsup"
     user

spec/factories/board_filter_labels.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :board_label do
     association :board
     association :label

spec/factories/boards.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :board do
     sequence(:name) { |n| "board#{n}" }
 

spec/factories/broadcast_messages.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :broadcast_message do
     message "MyText"
     starts_at 1.day.ago

spec/factories/chat_names.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :chat_name, class: ChatName do
     user factory: :user
     service factory: :service

spec/factories/chat_teams.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :chat_team, class: ChatTeam do
     sequence(:team_id) { |n| "abcdefghijklm#{n}" }
     namespace factory: :group

spec/factories/ci/build_trace_section_names.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_build_trace_section_name, class: Ci::BuildTraceSectionName do
     sequence(:name) { |n| "section_#{n}" }
     project factory: :project

spec/factories/ci/builds.rb

 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_build, class: Ci::Build do
     name 'test'
     stage 'test'

spec/factories/ci/group_variables.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_group_variable, class: Ci::GroupVariable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'

spec/factories/ci/job_artifacts.rb

 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_job_artifact, class: Ci::JobArtifact do
     job factory: :ci_build
     file_type :archive

spec/factories/ci/pipeline_schedule.rb

-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

spec/factories/ci/pipeline_schedule_variables.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_pipeline_schedule_variable, class: Ci::PipelineScheduleVariable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'

spec/factories/ci/pipeline_variables.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_pipeline_variable, class: Ci::PipelineVariable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'

spec/factories/ci/pipelines.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_empty_pipeline, class: Ci::Pipeline do
     source :push
     ref 'master'

spec/factories/ci/runner_projects.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_runner_project, class: Ci::RunnerProject do
     runner factory: :ci_runner
     project

spec/factories/ci/runners.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_runner, class: Ci::Runner do
     sequence(:description) { |n| "My runner#{n}" }
 

spec/factories/ci/sources/pipelines.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_sources_pipeline, class: Ci::Sources::Pipeline do
     after(:build) do |source|
       source.project ||= source.pipeline.project

spec/factories/ci/stages.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_stage, class: Ci::LegacyStage do
     skip_create
 

spec/factories/ci/trigger_requests.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_trigger_request, class: Ci::TriggerRequest do
     trigger factory: :ci_trigger
   end

spec/factories/ci/triggers.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_trigger_without_token, class: Ci::Trigger do
     owner
 

spec/factories/ci/variables.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ci_variable, class: Ci::Variable do
     sequence(:key) { |n| "VARIABLE_#{n}" }
     value 'VARIABLE_VALUE'

spec/factories/clusters/applications/helm.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_applications_helm, class: Clusters::Applications::Helm do
     cluster factory: %i(cluster provided_by_gcp)
 

spec/factories/clusters/applications/ingress.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_applications_ingress, class: Clusters::Applications::Ingress do
     cluster factory: %i(cluster provided_by_gcp)
 

spec/factories/clusters/clusters.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster, class: Clusters::Cluster do
     user
     name 'test-cluster'

spec/factories/clusters/platforms/kubernetes.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_platform_kubernetes, class: Clusters::Platforms::Kubernetes do
     cluster
     namespace nil

spec/factories/clusters/providers/gcp.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :cluster_provider_gcp, class: Clusters::Providers::Gcp do
     cluster
     gcp_project_id 'test-gcp-project'

spec/factories/commit_statuses.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :commit_status, class: CommitStatus do
     name 'default'
     stage 'test'

spec/factories/commits.rb

 require_relative '../support/repo_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :commit do
     transient do
       author nil

spec/factories/container_repositories.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :container_repository do
     name 'test_container_image'
     project

spec/factories/conversational_development_index_metrics.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :conversational_development_index_metric, class: ConversationalDevelopmentIndex::Metric do
     leader_issues 9.256
     instance_issues 1.234

spec/factories/deploy_keys_projects.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :deploy_keys_project do
     deploy_key
     project

spec/factories/deployments.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :deployment, class: Deployment do
     sha '97de212e80737a608d939f648d959671fb0a0142'
     ref 'master'

spec/factories/doorkeeper.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :doorkeeper_access_grant, class: Doorkeeper::AccessGrant do
     sequence(:resource_owner_id) { |n| n }
     association :application, factory: :doorkeeper_application

spec/factories/emails.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :email do
     user
     email { generate(:email_alias) }

spec/factories/environments.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :environment, class: Environment do
     sequence(:name) { |n| "environment#{n}" }
 

spec/factories/epic_issues.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :epic_issue do
     epic
     issue

spec/factories/epics.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :epic do
     title { generate(:title) }
     group

spec/factories/events.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :event do
     project
     author factory: :user

spec/factories/file_uploaders.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :file_uploader do
     skip_create
 

spec/factories/fork_network_members.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :fork_network_member do
     association :project
     association :fork_network

spec/factories/fork_networks.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :fork_network do
     association :root_project, factory: :project
   end

spec/factories/forked_project_links.rb

-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]

spec/factories/geo/event_log.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :geo_event_log, class: Geo::EventLog do
     trait :created_event do
       repository_created_event factory: :geo_repository_created_event

spec/factories/geo/event_log_state.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :geo_event_log_state, class: Geo::EventLogState do
     sequence(:event_id)
   end

spec/factories/geo/file_registry.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :geo_file_registry, class: Geo::FileRegistry do
     sequence(:file_id)
     file_type :file

spec/factories/geo/project_registry.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :geo_project_registry, class: Geo::ProjectRegistry do
     project
     last_repository_synced_at nil

spec/factories/geo_node_namespace_links.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :geo_node_namespace_link do
     geo_node
     namespace

spec/factories/geo_node_statuses.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :geo_node_status do
     sequence(:id)
     geo_node

spec/factories/geo_nodes.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :geo_node do
     # Start at a number higher than the current port to avoid the GeoNode
     # "lock out" validation

spec/factories/gitaly/commit.rb

-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

spec/factories/gitaly/commit_author.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :gitaly_commit_author, class: Gitaly::CommitAuthor do
     skip_create
 

spec/factories/gpg_key_subkeys.rb

 require_relative '../support/gpg_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :gpg_key_subkey do
     gpg_key
 

spec/factories/gpg_keys.rb

 require_relative '../support/gpg_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :gpg_key do
     key GpgHelpers::User1.public_key
     user

spec/factories/gpg_signature.rb

 require_relative '../support/gpg_helpers'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :gpg_signature do
     commit_sha { Digest::SHA1.hexdigest(SecureRandom.hex) }
     project

spec/factories/group_custom_attributes.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :group_custom_attribute do
     group
     sequence(:key) { |n| "key#{n}" }

spec/factories/group_hooks.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :group_hook do
     url { generate(:url) }
   end

spec/factories/group_members.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :group_member do
     access_level { GroupMember::OWNER }
     group

spec/factories/groups.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :group, class: Group, parent: :namespace do
     sequence(:name) { |n| "group#{n}" }
     path { name.downcase.gsub(/\s/, '_') }

spec/factories/identities.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :identity do
     provider 'ldapmain'
     extern_uid 'my-ldap-id'

spec/factories/instance_configuration.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :instance_configuration do
     skip_create
   end

spec/factories/issue_links.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :issue_link do
     source factory: :issue
     target factory: :issue

spec/factories/issues.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :issue do
     title { generate(:title) }
     author

spec/factories/keys.rb

 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' }

spec/factories/label_links.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :label_link do
     label
     target factory: :issue

spec/factories/label_priorities.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :label_priority do
     project
     label

spec/factories/labels.rb

-FactoryGirl.define do
+FactoryBot.define do
   trait :base_label do
     title { generate(:label_title) }
     color "#990000"

spec/factories/ldap_group_links.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :ldap_group_link do
     cn 'group1'
     group_access Gitlab::Access::GUEST

spec/factories/lfs_objects.rb

 include ActionDispatch::TestProcess
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :lfs_object do
     sequence(:oid) { |n| "b68143e6463773b1b6c6fd009a76c32aeec041faff32ba2ed42fd7f708a%05x" % n }
     size 499013

spec/factories/lfs_objects_projects.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :lfs_objects_project do
     lfs_object
     project

spec/factories/licenses.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :gitlab_license, class: "Gitlab::License" do
     skip_create
 

spec/factories/lists.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :list do
     board
     label

spec/factories/merge_requests.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :merge_request do
     title { generate(:title) }
     author

spec/factories/merge_requests_closing_issues.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :merge_requests_closing_issues do
     issue
     merge_request

spec/factories/milestones.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :milestone do
     title
 

spec/factories/namespace_statistics.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :namespace_statistics do
     namespace factory: :namespace
   end

spec/factories/namespaces.rb

-FactoryGirl.define do
+FactoryBot.define do
   factory :namespace do
     sequence(:name) { |n| "namespace#{n}" }
     path { name.downcase.gsub(/\s/, '_') }

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) }