Commit 79f6765f authored by Sean McGivern's avatar Sean McGivern

Merge branch '4813-quickfix' into 'master'

Resolve "spec/ee/spec/services/ee/projects/destroy_service_spec.rb is failing"

See merge request gitlab-org/gitlab-ee!4409
parents f108f9d6 28ecf7dd
...@@ -8,7 +8,7 @@ describe Gitlab::BackgroundMigration::PopulateMergeRequestMetricsWithEventsData, ...@@ -8,7 +8,7 @@ describe Gitlab::BackgroundMigration::PopulateMergeRequestMetricsWithEventsData,
end end
after do after do
[MergeRequest, MergeRequestDiff].each(&:reset_column_information) [Project, MergeRequest, MergeRequestDiff].each(&:reset_column_information)
end end
describe '#perform' do describe '#perform' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment