Skip to content

Allow missing side when listing conflicts on diffs

Patrick Bajao requested to merge 333687-allow-missing-side-list-conflicts into master

What does this MR do?

In gitaly!3648 (merged), support for listing conflicts even when there's a missing side has been added to ListConflictFiles RPC. This only happens when allow_tree_conflicts is set to true in the RPC request.

This allows gitlab-rails to use that parameter when displaying MR diffs with conflicts. The allow_tree_conflicts will be set to true only when display_merge_conflicts_in_diff is enabled. Otherwise, it'll be set to false.

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Related to #333687 (closed)

Edited by Patrick Bajao

Merge request reports