Merge branch 'id-update-factory-bot' into 'master'

[RUN ALL RSPEC] Upgrade factory_bot_rails to 6.1.0

See merge request gitlab-org/gitlab!50875

Gemfile

@@ -360,7 +360,7 @@ group :development, :test do
   gem 'awesome_print', require: false
 
   gem 'database_cleaner', '~> 1.7.0'
-  gem 'factory_bot_rails', '~> 5.1.0'
+  gem 'factory_bot_rails', '~> 6.1.0'
   gem 'rspec-rails', '~> 4.0.1'
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)

Gemfile.lock

@@ -321,11 +321,11 @@ GEM
     expression_parser (0.9.0)
     extended-markdown-filter (0.6.0)
       html-pipeline (~> 2.0)
-    factory_bot (5.1.0)
-      activesupport (>= 4.2.0)
-    factory_bot_rails (5.1.0)
-      factory_bot (~> 5.1.0)
-      railties (>= 4.2.0)
+    factory_bot (6.1.0)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.1.0)
+      factory_bot (~> 6.1.0)
+      railties (>= 5.0.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.7)
@@ -1331,7 +1331,7 @@ DEPENDENCIES
   email_spec (~> 2.2.0)
   erubi (~> 1.9.0)
   escape_utils (~> 1.1)
-  factory_bot_rails (~> 5.1.0)
+  factory_bot_rails (~> 6.1.0)
   faraday (~> 1.0)
   faraday_middleware-aws-sigv4 (~> 0.3.0)
   fast_blank

changelogs/unreleased/id-update-factory-bot.yml

+---
+title: Upgrade factory_bot_rails to 6.1.0
+merge_request: 50875
+author:
+type: other