Skip to content

Make merge to refs/merge-requests/:iid/merge not raise when FF-only enabled

Oswaldo Ferreira requested to merge osw-merge-to-ref-changes-for-ci-team into master

What does this MR do?

  1. Stop failing if the project merge method configuration is set to FF-only. Currently we're using the regular merge (with squash, if set). We're looking forward to support FF in https://gitlab.com/gitlab-org/gitlab-ce/issues/58226 %11.10
  2. Along with the created commit_id we're also retuning the source_id and target_id (respectively source branch HEAD SHA and target branch SHA used in the commit creation). CI-team needs reliable information of the source and target IDs in order to know they're running an outdated pipeline (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9622#note_145785333).

What are the relevant issue numbers?

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

Does this MR meet the acceptance criteria?

Edited by Oswaldo Ferreira

Merge request reports