Skip to content

Implement new preparing internal merge_status

Patrick Bajao requested to merge 291012-preparing-mr-state into master

What does this MR do?

When we check if MR is mergeable we also check the CI pipeline. Since we are creating the pipeline asynchronously via MergeRequests::AfterCreateService, there's a possible race condition wherein the pipeline isn't created yet but we already checked if MR is mergeable. That can result to inaccurate outcome.

To ensure that whenever we check if MR is mergeable, we introduced a new internal state called preparing. When the MR is in this state, it means it's still being prepared (e.g. creating a pipeline) and it's not mergeable.

Once the preparation is finished, we mark the MR as unchecked so we can check its mergeability when the user views the MR page.

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

Related to #291012 (closed)

Merge request reports