Skip to content

Rename merge_train Merge Request Association to merge_train_car

What does this MR do and why?

Currently, a MergeTrain represents a single MR in our code but in our product documentation a merge train is a list of MRs.

We want to make MergeTrain be MergeTrain::Car and have a model MergeTrain which represents the many MRs or cars for a projects branch. This will make the code easier to understand and lower the bar for entry for new contributors.

In this MR we only accomplish some of that:

  • renames MergeTrain to MergeTrain::Car
  • rename the association on merge_request from merge_train to merge_train_car
  • rename the factory from merge_train to merge_train_car

For now I exclude:

  • renaming any methods
  • renaming project.merge_train association
  • Moving the class methods on MergeTrain::Car to a MergeTrain Model
  • Renaming EE::API::Entities::MergeTrain

MR acceptance checklist

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

Related to #298541 (closed)

Edited by Allison Browne

Merge request reports