Skip to content

Support merge ref writing (without merging to target branch)

Oswaldo Ferreira requested to merge osw-create-and-store-merge-ref-for-mrs into master

What does this MR do?

Adds the ground work for writing the merge ref to refs/merge-requests/:iid/merge, merging the source and target branches of a MR without changing the target branch.

EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9471

  • Solve failed to create commit: current tip is not the first parent after first merge to ref is made
  • Improve tests
  • Get a green pipeline

Follow ups: https://gitlab.com/gitlab-org/gitlab-ce/issues/57920, https://gitlab.com/gitlab-org/gitlab-ce/issues/57252

What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47110

Does this MR meet the acceptance criteria?

Edited by Oswaldo Ferreira

Merge request reports