Commit 4cdce8e1 authored by Jan Provaznik's avatar Jan Provaznik

Merge branch 'bump-factory-bot-for-ruby3' into 'master'

Bump factory_bot_rails for Ruby3 support [RUN ALL RSPEC]

See merge request gitlab-org/gitlab!67866
parents 8df6be82 06d14dfe
...@@ -360,7 +360,7 @@ group :development, :test do ...@@ -360,7 +360,7 @@ group :development, :test do
gem 'awesome_print', require: false gem 'awesome_print', require: false
gem 'database_cleaner', '~> 1.7.0' gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 6.1.0' gem 'factory_bot_rails', '~> 6.2.0'
gem 'rspec-rails', '~> 5.0.1' gem 'rspec-rails', '~> 5.0.1'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
......
...@@ -340,10 +340,10 @@ GEM ...@@ -340,10 +340,10 @@ GEM
expression_parser (0.9.0) expression_parser (0.9.0)
extended-markdown-filter (0.6.0) extended-markdown-filter (0.6.0)
html-pipeline (~> 2.0) html-pipeline (~> 2.0)
factory_bot (6.1.0) factory_bot (6.2.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
factory_bot_rails (6.1.0) factory_bot_rails (6.2.0)
factory_bot (~> 6.1.0) factory_bot (~> 6.2.0)
railties (>= 5.0.0) railties (>= 5.0.0)
faraday (1.4.2) faraday (1.4.2)
faraday-em_http (~> 1.0) faraday-em_http (~> 1.0)
...@@ -728,7 +728,7 @@ GEM ...@@ -728,7 +728,7 @@ GEM
activesupport (>= 4) activesupport (>= 4)
railties (>= 4) railties (>= 4)
request_store (~> 1.0) request_store (~> 1.0)
loofah (2.9.1) loofah (2.11.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lru_redux (1.1.0) lru_redux (1.1.0)
...@@ -748,7 +748,7 @@ GEM ...@@ -748,7 +748,7 @@ GEM
mini_histogram (0.3.1) mini_histogram (0.3.1)
mini_magick (4.10.1) mini_magick (4.10.1)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.5.1) mini_portile2 (2.5.3)
minitest (5.11.3) minitest (5.11.3)
mixlib-cli (2.1.8) mixlib-cli (2.1.8)
mixlib-config (3.0.9) mixlib-config (3.0.9)
...@@ -786,7 +786,7 @@ GEM ...@@ -786,7 +786,7 @@ GEM
netrc (0.11.0) netrc (0.11.0)
nio4r (2.5.4) nio4r (2.5.4)
no_proxy_fix (0.1.2) no_proxy_fix (0.1.2)
nokogiri (1.11.5) nokogiri (1.11.7)
mini_portile2 (~> 2.5.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4) racc (~> 1.4)
nokogumbo (2.0.2) nokogumbo (2.0.2)
...@@ -1001,7 +1001,7 @@ GEM ...@@ -1001,7 +1001,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (~> 1.0) thor (~> 1.0)
rainbow (3.0.0) rainbow (3.0.0)
rake (13.0.3) rake (13.0.6)
rb-fsevent (0.10.4) rb-fsevent (0.10.4)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
...@@ -1449,7 +1449,7 @@ DEPENDENCIES ...@@ -1449,7 +1449,7 @@ DEPENDENCIES
email_spec (~> 2.2.0) email_spec (~> 2.2.0)
erubi (~> 1.9.0) erubi (~> 1.9.0)
escape_utils (~> 1.1) escape_utils (~> 1.1)
factory_bot_rails (~> 6.1.0) factory_bot_rails (~> 6.2.0)
faraday (~> 1.0) faraday (~> 1.0)
faraday_middleware-aws-sigv4 (~> 0.3.0) faraday_middleware-aws-sigv4 (~> 0.3.0)
fast_blank fast_blank
......
...@@ -12,7 +12,7 @@ gem 'rspec', '~> 3.10' ...@@ -12,7 +12,7 @@ gem 'rspec', '~> 3.10'
gem 'selenium-webdriver', '~> 4.0.0.beta4' gem 'selenium-webdriver', '~> 4.0.0.beta4'
gem 'airborne', '~> 0.3.4' gem 'airborne', '~> 0.3.4'
gem 'rest-client', '~> 2.1.0' gem 'rest-client', '~> 2.1.0'
gem 'nokogiri', '~> 1.11.1' gem 'nokogiri', '~> 1.11.7'
gem 'rspec-retry', '~> 0.6.1' gem 'rspec-retry', '~> 0.6.1'
gem 'rspec_junit_formatter', '~> 0.4.1' gem 'rspec_junit_formatter', '~> 0.4.1'
gem 'faker', '~> 1.6', '>= 1.6.6' gem 'faker', '~> 1.6', '>= 1.6.6'
......
...@@ -101,11 +101,11 @@ GEM ...@@ -101,11 +101,11 @@ GEM
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2021.0704) mime-types-data (3.2021.0704)
mini_mime (1.1.0) mini_mime (1.1.0)
mini_portile2 (2.5.0) mini_portile2 (2.5.3)
minitest (5.14.4) minitest (5.14.4)
multipart-post (2.1.1) multipart-post (2.1.1)
netrc (0.11.0) netrc (0.11.0)
nokogiri (1.11.1) nokogiri (1.11.7)
mini_portile2 (~> 2.5.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4) racc (~> 1.4)
octokit (4.21.0) octokit (4.21.0)
...@@ -221,7 +221,7 @@ DEPENDENCIES ...@@ -221,7 +221,7 @@ DEPENDENCIES
faker (~> 1.6, >= 1.6.6) faker (~> 1.6, >= 1.6.6)
gitlab-qa gitlab-qa
knapsack (~> 1.17) knapsack (~> 1.17)
nokogiri (~> 1.11.1) nokogiri (~> 1.11.7)
octokit (~> 4.21) octokit (~> 4.21)
parallel (~> 1.19) parallel (~> 1.19)
parallel_tests (~> 2.29) parallel_tests (~> 2.29)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment