diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-15 16:32:34 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-15 16:32:34 +0000 |
| commit | 627a96875ee68e37b45192af3121f09032ea4bbf (patch) | |
| tree | 983781e7aaff8f50c0f81c27d9b352a63b3543cb /Gemfile.lock | |
| parent | d2f313dcbccc1e3642fb0ccdf0849e0ef4ec8e21 (diff) | |
| parent | 4af9d592c500d2d97ec091d10ba860488c3702ea (diff) | |
| download | gitlab-ce-627a96875ee68e37b45192af3121f09032ea4bbf.tar.gz | |
Merge branch 'rc/use-factory_bot_rails' into 'master'
Replace factory_girl_rails with factory_bot_rails
See merge request gitlab-org/gitlab-ce!15919
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 55600555e4d..11040fab805 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -195,10 +195,10 @@ GEM excon (0.57.1) execjs (2.6.0) expression_parser (0.9.0) - factory_girl (4.7.0) + factory_bot (4.8.2) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_bot_rails (4.8.2) + factory_bot (~> 4.8.2) railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) @@ -1020,7 +1020,7 @@ DEPENDENCIES dropzonejs-rails (~> 0.7.1) email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) - factory_girl_rails (~> 4.7.0) + factory_bot_rails (~> 4.8.2) faraday (~> 0.12) ffaker (~> 2.4) flay (~> 2.8.0) |