Automatic merge of gitlab-org/gitlab-ce master

Gemfile

@@ -340,7 +340,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'

Gemfile.lock

@@ -148,7 +148,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)
@@ -1003,7 +1003,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)