Allow conflicts to be merged in diff
When we're calculating merge-ref-head diff, we want the conflicts to be merged in diff in order to display them differently
显示
- Gemfile 1 个添加, 1 个删除Gemfile
- Gemfile.lock 2 个添加, 2 个删除Gemfile.lock
- app/models/merge_request.rb 1 个添加, 1 个删除app/models/merge_request.rb
- app/models/repository.rb 2 个添加, 2 个删除app/models/repository.rb
- app/services/merge_requests/merge_to_ref_service.rb 8 个添加, 1 个删除app/services/merge_requests/merge_to_ref_service.rb
- app/services/merge_requests/mergeability_check_service.rb 9 个添加, 4 个删除app/services/merge_requests/mergeability_check_service.rb
- config/feature_flags/development/display_merge_conflicts_in_diff.yml 7 个添加, 0 个删除...ure_flags/development/display_merge_conflicts_in_diff.yml
- lib/gitlab/git/repository.rb 2 个添加, 2 个删除lib/gitlab/git/repository.rb
- lib/gitlab/gitaly_client/operation_service.rb 3 个添加, 2 个删除lib/gitlab/gitaly_client/operation_service.rb
- spec/lib/gitlab/git/repository_spec.rb 2 个添加, 1 个删除spec/lib/gitlab/git/repository_spec.rb
- spec/lib/gitlab/gitaly_client/operation_service_spec.rb 2 个添加, 1 个删除spec/lib/gitlab/gitaly_client/operation_service_spec.rb
- spec/models/merge_request_spec.rb 18 个添加, 6 个删除spec/models/merge_request_spec.rb
- spec/services/merge_requests/merge_to_ref_service_spec.rb 11 个添加, 0 个删除spec/services/merge_requests/merge_to_ref_service_spec.rb
- spec/services/merge_requests/mergeability_check_service_spec.rb 31 个添加, 2 个删除...ervices/merge_requests/mergeability_check_service_spec.rb
加载中
想要评论请 注册 或 登录