BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit d614a9c3 by Lin Jen-Shin
Options

Fix bad conflict resolution

parent a050fc8e
Showing with 0 additions and 1 deletion
app/models/ci/pipeline.rb
...@@ -236,7 +236,6 @@ module Ci ...@@ -236,7 +236,6 @@ module Ci
yield(job) if block_given? yield(job) if block_given?
job.cancel job.cancel
end end
end
end end
def auto_cancel_running(pipeline) def auto_cancel_running(pipeline)
......
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