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

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.

Includes catfile cache, as well as fixes to the catfile cache code that
caused it to panic in Gitaly

Updates the gitaly client to use path_bytes field instead of the
deprecated path field in list_last_commits_for_tree_response.
Also adds a test to guard against non-utf8 path data

The gitaly branch has been merged to master and deleted so
need to use master for now until a release gets out.

Add `GetArchiveRequest` to git-archive params.

Modifies `Git::Repository#archive_metadata` to append `path`
to `ArchivePrefix` so it'll not hit the cache of repository archive
when it already exists.

This reverts merge request !26026

Fixes bug in FindAllTags when using a commit sha as the tagname
would cause an error

This version includes the server side feature gates required for
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25615

When `force` is set to `true` and `start_branch` is set, the
branch will be ovewritten with the new commit based on the
`HEAD` of the `start_branch`.

This commit includes changes to update the `gitaly-proto` gem.

In 11.8, we added a fix for the SearchFilesByContent RPC in gitaly to
send back the response in chunks. However, we kept in the old code path
for backwards compatibility. Now that the change is fully deployed, we
can remove that old codepath.

Adds the ground work for writing into
the merge ref refs/merge-requests/:iid/merge the
merge result between source and target branches of
a MR, without further side-effects such as
mailing, MR updates and target branch changes.

This fixes gRPC dialing to UNIX domain sockets.

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

refactors the ui for diverging commits so that it's only a single
bar instead of two separate bars

Adds the client call for the gitaly rpc CountDivergingCommits

fixing signature

simplifying commit logic

adding test for max-count

refactoring tests