Add system messages to MR page for merge trains support for fast forward merge
Problem
When fast forward and merge train are enabled together, when the master
branch advances, the only way users could merge their MR is by manually rebasing their feature branch
on the master
and pushing it to the remote repository.
More details about this issue could be found in &4911 (closed)
Proposal
object model realignments are done
2021-12-30 - currently blocked until(General: When a fast-forward merge with merge train is not possible, the application will try to rebase - this will rebase the entire merge train. Rebasing on merge train should happen automatically and shouldn't require a manual action from users)
On the MR widget, add system messages for the following scenarios:
Fast-forward with merge train fails:
- A message should be added to the
system notes
in the merge request.
Rebase with merge train fails:
- A message should be added to the
system notes
in the merge request.
Fast-forward / Rebase with merge train succeeds:
- A message should be added to the
system notes
in the merge request. - @dosuken123 to check: An existing rebase/ff-merge feature already provides some system notes for the usage, so we might not need to add extra ones in merge train context.
Reference the old designs here.
This page may contain information related to upcoming products, features and functionality. It is important to note that the information presented is for informational purposes only, so please do not rely on the information for purchasing or planning purposes. Just like with all projects, the items mentioned on the page are subject to change or delay, and the development, release, and timing of any products, features, or functionality remain at the sole discretion of GitLab Inc.