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`.
显示
- Gemfile 1 个添加, 1 个删除Gemfile
- Gemfile.lock 4 个添加, 4 个删除Gemfile.lock
- app/controllers/projects/merge_requests/diffs_controller.rb 8 个添加, 2 个删除app/controllers/projects/merge_requests/diffs_controller.rb
- app/helpers/diff_helper.rb 4 个添加, 4 个删除app/helpers/diff_helper.rb
- app/serializers/diffs_entity.rb 6 个添加, 1 个删除app/serializers/diffs_entity.rb
- app/serializers/paginated_diff_entity.rb 1 个添加, 1 个删除app/serializers/paginated_diff_entity.rb
- app/services/merge_requests/conflicts/base_service.rb 3 个添加, 2 个删除app/services/merge_requests/conflicts/base_service.rb
- app/services/merge_requests/conflicts/list_service.rb 5 个添加, 1 个删除app/services/merge_requests/conflicts/list_service.rb
- lib/gitlab/conflict/file.rb 1 个添加, 1 个删除lib/gitlab/conflict/file.rb
- lib/gitlab/conflict/file_collection.rb 2 个添加, 2 个删除lib/gitlab/conflict/file_collection.rb
- lib/gitlab/git/conflict/file.rb 9 个添加, 0 个删除lib/gitlab/git/conflict/file.rb
- lib/gitlab/git/conflict/resolver.rb 3 个添加, 2 个删除lib/gitlab/git/conflict/resolver.rb
- lib/gitlab/gitaly_client/conflicts_service.rb 3 个添加, 2 个删除lib/gitlab/gitaly_client/conflicts_service.rb
- spec/controllers/projects/merge_requests/diffs_controller_spec.rb 16 个添加, 0 个删除...trollers/projects/merge_requests/diffs_controller_spec.rb
- spec/lib/gitlab/conflict/file_spec.rb 4 个添加, 0 个删除spec/lib/gitlab/conflict/file_spec.rb
- spec/lib/gitlab/git/conflict/file_spec.rb 14 个添加, 0 个删除spec/lib/gitlab/git/conflict/file_spec.rb
- spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb 19 个添加, 6 个删除spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb
- spec/requests/projects/merge_requests/diffs_spec.rb 1 个添加, 0 个删除spec/requests/projects/merge_requests/diffs_spec.rb
- spec/serializers/diffs_entity_spec.rb 20 个添加, 2 个删除spec/serializers/diffs_entity_spec.rb
- spec/serializers/paginated_diff_entity_spec.rb 16 个添加, 2 个删除spec/serializers/paginated_diff_entity_spec.rb
加载中
想要评论请 注册 或 登录