Skip to content
代码片段 群组 项目
提交 e114784c 编辑于 作者: Patrick Bajao's avatar Patrick Bajao
浏览文件

Allow missing side when listing conflicts on diffs

In https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3648,
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`.
上级 ccaf08c9
No related branches found
No related tags found
加载中
显示
140 个添加33 个删除
加载中
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册