Skip to content

Fix currentDiffFileId being set incorrectly

Phil Hughes requested to merge ph/fileByFileDiffFileNoLongerExists into master

What does this MR do?

Fixes currentDiffFileId being set incorrectly when a diff file doesn't exist. This can happen when the user opens a merge request to a note on a diff file that is no longer in the diff.

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Merge request reports