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 /config/application.rb | |
| 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 'config/application.rb')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 25c5a8f5a99..1110199b888 100644 --- a/config/application.rb +++ b/config/application.rb @@ -163,7 +163,7 @@ module Gitlab config.middleware.insert_after ActionDispatch::Flash, 'Gitlab::Middleware::ReadOnly' config.generators do |g| - g.factory_girl false + g.factory_bot false end config.after_initialize do |