diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-31 19:58:30 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-31 19:58:30 +0300 |
| commit | 4d875a2bc365d1c5eb9c0965f91e688efae1e143 (patch) | |
| tree | 3bbd661f1b78a89c9771156bf41dc805ac4260d2 | |
| parent | 4d799818aa6d33ae652dd062cde0a2bf0d036dc8 (diff) | |
| parent | 618fd31aad4856a7f86896ceca1bdf4589da1b83 (diff) | |
Merge branch 'rails52-dbcleaner' into 'master'
Bump database_cleaner version
Closes #55539
See merge request gitlab-org/gitlab-ce!23985
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -328,7 +328,7 @@ group :development, :test do gem 'awesome_print', require: false gem 'fuubar', '~> 2.2.0' - gem 'database_cleaner', '~> 1.5.0' + gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 4.8.2' gem 'rspec-rails', '~> 3.7.0' gem 'rspec-retry', '~> 0.4.5' diff --git a/Gemfile.lock b/Gemfile.lock index 942dbac27a6..f70f24da248 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -140,7 +140,7 @@ GEM css_parser (1.5.0) addressable daemons (1.2.6) - database_cleaner (1.5.3) + database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) deckar01-task_list (2.0.0) @@ -973,7 +973,7 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.0) creole (~> 0.5.0) - database_cleaner (~> 1.5.0) + database_cleaner (~> 1.7.0) deckar01-task_list (= 2.0.0) device_detector devise (~> 4.4) |