Skip to content

WIP: Move fast-forward merge request code around for CE port

username-removed-892863 requested to merge ee-ff_port_from_ee into master

What does this MR do?

CE MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272

  • Move fast-forward merge request code around for CE port
    • "Fast-forward merge" setting at /namespace/repo/edit
    • Fast-forward normal state and conflict state for MR widget

Are there points in the code the reviewer needs to double check?

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

See https://gitlab.com/gitlab-org/gitlab-ce/issues/20076

Merge request reports