diff options
author | Robert Speicher <robert@gitlab.com> | 2017-01-16 22:53:09 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-01-16 22:53:09 +0000 |
commit | 30aa15c493d088b7531dca0dc1b0d1987a709711 (patch) | |
tree | 951b050ca2f22553038f894a87c8e99a0b8da430 | |
parent | 142be72a2aa6920fa60cc267737f2e702fdeae12 (diff) | |
parent | feeb490a6c8611e1a03b007aaa9b6ab3baa0c853 (diff) | |
download | gitlab-ce-30aa15c493d088b7531dca0dc1b0d1987a709711.tar.gz |
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
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -286,7 +286,7 @@ group :development, :test do gem 'minitest', '~> 5.7.0' # Generate Fake data - gem 'ffaker', '~> 2.0.0' + gem 'ffaker', '~> 2.4' gem 'capybara', '~> 2.6.2' gem 'capybara-screenshot', '~> 1.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index e2d7f94e571..404534dcd95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -198,7 +198,7 @@ GEM faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json - ffaker (2.0.0) + ffaker (2.4.0) ffi (1.9.10) flay (2.6.1) ruby_parser (~> 3.0) @@ -877,7 +877,7 @@ DEPENDENCIES email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) factory_girl_rails (~> 4.7.0) - ffaker (~> 2.0.0) + ffaker (~> 2.4) flay (~> 2.6.1) fog-aws (~> 0.9) fog-core (~> 1.40) |