Skip to content

Rename MergeTrain to MergeTrains::Car

Allison Browne requested to merge 298541-2 into master

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 MergeTrains::Car and have a model MergeTrains:Train 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
  • Fixes related rubocop violations

For now I exclude:

  • rename the association on merge_request from merge_train to merge_train_car !115897 (merged)
  • rename the factory from merge_train to merge_train_car !115897 (merged)
  • renaming any methods
  • renaming project.merge_train association
  • Moving the class methods on MergeTrain::Car to a MergeTrain Model
  • Renaming EE::API::Entities::MergeTrain
Edited by Allison Browne

Merge request reports