-
- Downloads
Fix race condition on merge train ref generation
Today, Pipelines for merge train run on `refs/merge`, however, this causes a race condition that it can be overwritten by CheckMergeabilityService. This patch fixes the problem by generating `refs/train` for those pipelines.
Showing
- app/models/merge_request.rb 13 additions, 0 deletionsapp/models/merge_request.rb
- app/models/repository.rb 4 additions, 0 deletionsapp/models/repository.rb
- spec/models/merge_request_spec.rb 30 additions, 0 deletionsspec/models/merge_request_spec.rb
- spec/services/merge_requests/merge_to_ref_service_spec.rb 9 additions, 0 deletionsspec/services/merge_requests/merge_to_ref_service_spec.rb
Please register or sign in to comment