Commit d2f6b310 authored by Sean Carroll's avatar Sean Carroll

Apply suggestion to ee/app/services/merge_trains/refresh_merge_request_service.rb

parent 8cb3d7aa
...@@ -114,7 +114,7 @@ module MergeTrains ...@@ -114,7 +114,7 @@ module MergeTrains
end end
def cancel_pipeline_for_merge_train(new_pipeline) def cancel_pipeline_for_merge_train(new_pipeline)
pipeline_for_merge_train&.auto_cancel_running(new_pipeline, retries = 1) pipeline_for_merge_train&.auto_cancel_running(new_pipeline, retries: 1)
rescue ActiveRecord::StaleObjectError rescue ActiveRecord::StaleObjectError
# Often the pipeline has already been canceled by the default cancelaltion # Often the pipeline has already been canceled by the default cancelaltion
# mechanizm `Ci::CreatePipelineService#cancel_pending_pipelines`. In this # mechanizm `Ci::CreatePipelineService#cancel_pending_pipelines`. In this
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment