-
- Downloads
There was an error fetching the commit references. Please try again later.
Stop MR conflict code from blowing up when branches are missing
Showing
- app/models/merge_request.rb 2 additions, 0 deletionsapp/models/merge_request.rb
- app/services/merge_requests/conflicts/list_service.rb 1 addition, 0 deletionsapp/services/merge_requests/conflicts/list_service.rb
- lib/gitlab/diff/position_tracer.rb 1 addition, 1 deletionlib/gitlab/diff/position_tracer.rb
- spec/services/merge_requests/conflicts/list_service_spec.rb 7 additions, 0 deletionsspec/services/merge_requests/conflicts/list_service_spec.rb
Please register or sign in to comment