Skip to content

Allow nil in the project model on delegated CI/CD settings

What does this MR do?

This is a workaround for a race condition in which attempting to access ci_cd_settings fails because the project it belongs to is being deleted. However, it's not deleted in a transaction so if the ci_cd_settings records have been deleted but the project has not yet, the result is error 500:

Project#ci_default_git_depth delegated to ci_cd_settings.default_git_depth, but ci_cd_settings is nil

That resulted in many transient QA failures across many tests when calling GET /groups/:id. See #321467 (closed)

Credit to @stanhu for suggesting this fix.

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.

  • [-] 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

Related to #321467 (closed)

Edited by Mark Lapierre

Merge request reports