diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-06 18:35:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-06 18:35:04 +0000 |
| commit | dffd5669c7942cd46f084c9d12b28b4b8fb8c7f8 (patch) | |
| tree | 953faec33d1fbd436f2925cf9745ec2c43b3733c | |
| parent | 7095c2bf4064911568ae1574752adbc066c5347d (diff) | |
| parent | e39031deca2635eb174beafefb25e9feddb1dd30 (diff) | |
| download | gitlab-ce-dffd5669c7942cd46f084c9d12b28b4b8fb8c7f8.tar.gz | |
Merge branch 'ce-4813-quickfix' into 'master'
Resolve "spec/ee/spec/services/ee/projects/destroy_service_spec.rb is failing"
See merge request gitlab-org/gitlab-ce!16955
| -rw-r--r-- | spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb b/spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb index 4cdb679c97f..2b69e718e08 100644 --- a/spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb +++ b/spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb @@ -8,7 +8,7 @@ describe Gitlab::BackgroundMigration::PopulateMergeRequestMetricsWithEventsData, end after do - [MergeRequest, MergeRequestDiff].each(&:reset_column_information) + [Project, MergeRequest, MergeRequestDiff].each(&:reset_column_information) end describe '#perform' do |