GitalyBot authored 5 years ago and Bob Van Landuyt :neckbeard: committed 5 years ago

The setup was wrong, and due to Gitaly being a bit more strict it had to
match up. The test is now accurate and passing again.

This couples the code that transitions the `MergeRequest#merge_status`
and refs/merge-requests/:iid/merge ref update.

In general, instead of directly telling `MergeToRefService` to update
the merge ref, we should rely on `MergeabilityCheckService` to keep
both the merge status and merge ref synced. Now, if the merge_status is
`can_be_merged` it means the merge-ref is also updated to the latest.

We've also updated the logic to be more systematic and less user-based.

CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13460

Douwe Maan authored 5 years ago and Mayra Cabrera committed 5 years ago

This change makes sure Gitaly includes a fix to make rebase work again
properly.

Part of: https://gitlab.com/gitlab-org/gitlab-ce/issues/62353

This version of Gitaly fixes a bug in gitaly-wrapper
that prevented the proper detection of the executable
path for a Gitaly process.