Update diff note representation

What does this MR do and why?

Backport of Update diff note representation (!214049 - merged)

Generates a hunk for nil diff_hunks on PR/MR diffs to avoid no method errors when importing from GitHub.

Errors were reported when importing from GitHub to GitLab Enterprise 18.5.1-ee

"exception_class": "NoMethodError", "exception_message": "undefined method `new_pos' for nil:NilClass", "source": "Gitlab::GithubImport::Importer::DiffNoteImporter"

The errors appeared to correlate with the roll-out of a beta feature on GitHub.

It was noted in the Github UI that some PRs had some unusual hidden comments that were only visible if the feature was enabled in the UI. This may have caused Github's data model to drift.

This fix generates a diff_hunk when it is nil or empty. It finds the code context by querying the repository blob.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

  • This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch.
  • The MR that fixed the bug on the default branch has been deployed to GitLab.com (not applicable for documentation or spec changes).
  • The MR title is descriptive (e.g. "Backport of 'title of default branch MR'"). This is important, since the title will be copied to the patch blog post.
  • Required labels have been applied to this merge request
  • This MR has been approved by a maintainer (only one approval is required).
  • Ensure the e2e:test-on-omnibus-ee job has succeeded, or if it has failed, investigate the failures. If you determine the failures are unrelated, you may proceed. If you need assistance investigating, reach out to a Software Engineer in Test in #s_developer_experience.

Note to the merge request author and maintainer

If you have questions about the patch release process, please:

Edited by Carla Drago

Merge request reports

Loading