BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit e1f092e3 by Robert Speicher Committed by James Lopez
Options

Merge branch '26492-fix-transient-failure-in-commits_spec' into 'master'

Update ffaker to ~>2.4 to avoid generating names with suffixes Closes #26492 See merge request !8596
parent fad89f37
Showing with 3 additions and 3 deletions
Gemfile
...@@ -286,7 +286,7 @@ group :development, :test do ...@@ -286,7 +286,7 @@ group :development, :test do
gem 'minitest', '~> 5.7.0' gem 'minitest', '~> 5.7.0'
# Generate Fake data # Generate Fake data
gem 'ffaker', '~> 2.0.0' gem 'ffaker', '~> 2.4'
gem 'capybara', '~> 2.6.2' gem 'capybara', '~> 2.6.2'
gem 'capybara-screenshot', '~> 1.0.0' gem 'capybara-screenshot', '~> 1.0.0'
......
Gemfile.lock
...@@ -198,7 +198,7 @@ GEM ...@@ -198,7 +198,7 @@ GEM
faraday_middleware-multi_json (0.0.6) faraday_middleware-multi_json (0.0.6)
faraday_middleware faraday_middleware
multi_json multi_json
ffaker (2.0.0) ffaker (2.4.0)
ffi (1.9.10) ffi (1.9.10)
flay (2.6.1) flay (2.6.1)
ruby_parser (~> 3.0) ruby_parser (~> 3.0)
...@@ -877,7 +877,7 @@ DEPENDENCIES ...@@ -877,7 +877,7 @@ DEPENDENCIES
email_reply_trimmer (~> 0.1) email_reply_trimmer (~> 0.1)
email_spec (~> 1.6.0) email_spec (~> 1.6.0)
factory_girl_rails (~> 4.7.0) factory_girl_rails (~> 4.7.0)
ffaker (~> 2.0.0) ffaker (~> 2.4)
flay (~> 2.6.1) flay (~> 2.6.1)
fog-aws (~> 0.9) fog-aws (~> 0.9)
fog-core (~> 1.40) fog-core (~> 1.40)
......
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