Merge branch...

Merge branch 'mk/fix-pg-undefined-table-untracked_files_for_uploads-does-not-exist-ee' into 'master'

[EE port] Fix deletion attempts on dropped tables

See merge request gitlab-org/gitlab-ee!4712

spec/support/db_cleaner.rb

@@ -30,11 +30,11 @@ RSpec.configure do |config|
   end
 
   config.before(:each, :js) do
-    DatabaseCleaner.strategy = :deletion, { except: %w[licenses] }
+    DatabaseCleaner.strategy = :deletion, { except: %w[licenses], cache_tables: false }
   end
 
   config.before(:each, :delete) do
-    DatabaseCleaner.strategy = :deletion, { except: %w[licenses] }
+    DatabaseCleaner.strategy = :deletion, { except: %w[licenses], cache_tables: false }
   end
 
   config.before(:each, :migration) do