Refactor MergeRequests::MergeService to separate out service classes
This was raised as a pre-requisite for Fast Forward Merge Trains
Background: Adding FF Merge train implementation logic to MergeRequests::MergeService is made tricky by the self-referential inheritance. This makes anything we do a "monkey patch" to get it to work.
To properly fix this, we'll need to refactor the base class to separate out the different merge strategies.
Then after the refactoring is done, we can implement FF Merge Trains logic ontop of it.
There should be a rollout issue for this, as it touches a lot of base code for merges
Designs
- Show closed items
Is blocked by
Activity
-
Newest first Oldest first
-
Show all activity Show comments only Show history only
- Max Fan added grouppipeline execution label
added grouppipeline execution label
- 🤖 GitLab Bot 🤖 added devopsverify sectionci labels
added devopsverify sectionci labels
- Max Fan mentioned in merge request !128177 (merged)
mentioned in merge request !128177 (merged)
- Developer
@mfanGitLab is there a separate rollout issue for this as well?
Collapse replies - Author Maintainer
@carolinesimpson , yes there is. I'll create one shortly and also fill in the details for this issue
1
- Caroline Simpson added cicdactive typemaintenance workflowin dev labels
added cicdactive typemaintenance workflowin dev labels
- Caroline Simpson set weight to 1
set weight to 1
- Caroline Simpson changed milestone to %16.3
changed milestone to %16.3
- Caroline Simpson assigned to @mfanGitLab
assigned to @mfanGitLab
- Caroline Simpson assigned to @hfyngvason
assigned to @hfyngvason
- Max Fan marked this issue as blocking #420949 (closed)
marked this issue as blocking #420949 (closed)
- Max Fan changed the description
Compare with previous version changed the description
- Max Fan unassigned @mfanGitLab
unassigned @mfanGitLab
- 🤖 GitLab Bot 🤖 mentioned in issue gitlab-org/quality/triage-reports#13605 (closed)
mentioned in issue gitlab-org/quality/triage-reports#13605 (closed)
- 🤖 GitLab Bot 🤖 mentioned in issue gitlab-org/quality/triage-reports#13609 (closed)
mentioned in issue gitlab-org/quality/triage-reports#13609 (closed)
- Hordur Freyr Yngvason mentioned in issue #282442 (closed)
mentioned in issue #282442 (closed)
- 🤖 GitLab Bot 🤖 mentioned in issue gitlab-org/quality/triage-reports#13702 (closed)
mentioned in issue gitlab-org/quality/triage-reports#13702 (closed)
- 🤖 GitLab Bot 🤖 mentioned in issue gitlab-org/quality/triage-reports#13706 (closed)
mentioned in issue gitlab-org/quality/triage-reports#13706 (closed)
- Hordur Freyr Yngvason mentioned in issue #418822 (closed)
mentioned in issue #418822 (closed)
- Caroline Simpson mentioned in issue gitlab-org/ci-cd/pipeline-execution#145 (closed)
mentioned in issue gitlab-org/ci-cd/pipeline-execution#145 (closed)
- Maintainer
The feature flag has been globally enabled in production
- Hordur Freyr Yngvason mentioned in commit 086b91a5
mentioned in commit 086b91a5
- Hordur Freyr Yngvason mentioned in merge request !129539 (merged)
mentioned in merge request !129539 (merged)
- Maintainer
Opened !129539 (merged) for the feature flag cleanup. Will send it to reviews after a day or two
- Hordur Freyr Yngvason mentioned in commit 4938d9e8
mentioned in commit 4938d9e8
- Hordur Freyr Yngvason mentioned in commit 1df5b649
mentioned in commit 1df5b649
- Hordur Freyr Yngvason mentioned in commit 8f088815
mentioned in commit 8f088815
- Hordur Freyr Yngvason mentioned in commit 1796a9fe
mentioned in commit 1796a9fe
- Hordur Freyr Yngvason mentioned in commit 94f67a7d
mentioned in commit 94f67a7d
- 🤖 GitLab Bot 🤖 mentioned in issue gitlab-org/quality/triage-reports#13767 (closed)
mentioned in issue gitlab-org/quality/triage-reports#13767 (closed)
- 🤖 GitLab Bot 🤖 mentioned in issue gitlab-org/quality/triage-reports#13771 (closed)
mentioned in issue gitlab-org/quality/triage-reports#13771 (closed)
- 🤖 GitLab Bot 🤖 changed milestone to %16.4
changed milestone to %16.4
- 🤖 GitLab Bot 🤖 added missed:16.3 label
added missed:16.3 label
- Ghost User mentioned in issue gl-retrospectives/verify-stage/pipeline-execution#45 (closed)
mentioned in issue gl-retrospectives/verify-stage/pipeline-execution#45 (closed)
- Hordur Freyr Yngvason mentioned in commit fda4dd02
mentioned in commit fda4dd02
- Hordur Freyr Yngvason mentioned in commit 36cf8db0
mentioned in commit 36cf8db0
- Hordur Freyr Yngvason added workflowverification label and removed workflowin dev label
added workflowverification label and removed workflowin dev label
- Hordur Freyr Yngvason removed the relation with #420949 (closed)
removed the relation with #420949 (closed)
- Hordur Freyr Yngvason marked this issue as blocked by #420949 (closed)
marked this issue as blocked by #420949 (closed)
- Maintainer
The feature flag cleanup is now merged. Leaving in workflowverification as the cleaned up code has not been rolled out to production.
- Baodong mentioned in merge request !130256 (merged)
mentioned in merge request !130256 (merged)
- 🤖 GitLab Bot 🤖 mentioned in issue gitlab-org/quality/triage-reports#13863 (closed)
mentioned in issue gitlab-org/quality/triage-reports#13863 (closed)
- Developer
Adding category
- Jackie Porter added Category:Merge Trains label
added Category:Merge Trains label
- MaintainerResolved by Jackie Porter
The cleanup MR is rolled out and people are still merging merge requests without problems. So this is done
1 1 reply Last reply by Jackie Porter
- Hordur Freyr Yngvason added workflowcomplete label and removed workflowverification label
added workflowcomplete label and removed workflowverification label
- Hordur Freyr Yngvason closed
closed
- Hordur Freyr Yngvason mentioned in issue #418819 (closed)
mentioned in issue #418819 (closed)
- Hordur Freyr Yngvason mentioned in merge request gitlab-com/www-gitlab-com!128855 (merged)
mentioned in merge request gitlab-com/www-gitlab-com!128855 (merged)
- Caroline Simpson mentioned in issue #459885 (closed)
mentioned in issue #459885 (closed)