features/support/db_cleaner.rb · ad663560a7294acd36c22ba488a790fff95b49e0 · nexedi / gitlab-ce

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-24 · ad663560

GitLab Bot authored Jan 24, 2018

# Conflicts:
#	.gitlab-ci.yml
#	app/assets/javascripts/dispatcher.js
#	app/views/search/_category.html.haml
#	features/support/db_cleaner.rb
#	lib/gitlab/git/repository.rb
#	spec/services/issues/move_service_spec.rb
#	spec/support/db_cleaner.rb

[ci skip]

ad663560

db_cleaner.rb 328 Bytes

Replace db_cleaner.rb