summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-01-16 15:22:11 -0500
committerRémy Coutable <remy@rymai.me>2017-01-16 15:22:11 -0500
commitfeeb490a6c8611e1a03b007aaa9b6ab3baa0c853 (patch)
tree951b050ca2f22553038f894a87c8e99a0b8da430
parent142be72a2aa6920fa60cc267737f2e702fdeae12 (diff)
downloadgitlab-ce-26492-fix-transient-failure-in-commits_spec.tar.gz
Update ffaker to ~>2.4 to avoid generating names with suffixes26492-fix-transient-failure-in-commits_spec
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 07ff500dfea..a4454e2cd56 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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)