Skip to content

Move Pipeline#merge_request_event_type => :merge_train into EE

drew stachon requested to merge pipeline-merge-request-event-type-specs into master

What does this MR do?

This MR adds specs that had surfaced a bug in Ci::Pipeline#merge_request_event_type that's since been corrected in another MR. I think it's worth contributing these specs and the additional Pipeline factory, as they will do a better job of specifying the behavior and make the factory available for writing other specs around merge train pipelines.

In review, we also decided to move the logic for determining that a Pipeline's MR event type is :merge_train into EE, since Merge Trains are an EE feature and generally not used or referenced in the FOSS version of Gitlab.

Does this MR meet the acceptance criteria?

Conformity

Performance 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
Edited by Mayra Cabrera

Merge request reports