Skip to content

Add prepend_mod to FromSourceBranch

Baodong requested to merge gitlab-jh/jh-team/gitlab:upstream-add-prepend-mod-to-from-source-branch into master

What does this MR do and why?

Add prepend_mod to FromSourceBranch class.

Related Issue: #420668 (closed)

Related MRs:

In this refactor, moved the method squash_sha! from app/services/merge_requests/merge_base_service.rb to app/services/merge_requests/merge_base_service.rb,

and , the new class with no prepend_mod attached.

A feature of JH is dependent on squash_sha method: https://jihulab.com/gitlab-cn/gitlab/blob/9c12965418b47bbff50b689028282fbee2102625/jh/app/services/jh/merge_requests/merge_base_service.rb#L11

Failed Pipeline on JH: https://jihulab.com/gitlab-cn/gitlab/-/pipelines/1491428

cc @prajnamas @mtan-gitlab

Screenshots or screen recordings

Non-UI

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

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

Edited by Baodong

Merge request reports