Merge branch...

Merge branch '42074-rspec-spec-lib-gitlab-background_migration-deserialize_merge_request_diffs_and_commits_spec-rb-spec-services-system_note_service_spec-rb-fails' into 'master'

Resolve "rspec spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb spec/services/system_note_service_spec.rb fails"

Closes #42074

See merge request gitlab-org/gitlab-ce!16487

spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb

@@ -15,6 +15,10 @@ describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :t
         .to receive(:commits_count=).and_return(nil)
     end
 
+    after do
+      [Project, MergeRequest, MergeRequestDiff].each(&:reset_column_information)
+    end
+
     def diffs_to_hashes(diffs)
       diffs.as_json(only: Gitlab::Git::Diff::SERIALIZE_KEYS).map(&:with_indifferent_access)
     end