Commit 4747bd59 authored by Avielle Wolfe's avatar Avielle Wolfe

Change pipeline status to canceled

The PipelineCancel mutation was canceling the jobs in the pipeline, but
not marking the pipeline itself as canceled. This commit fixes that

Changelog: fixed
parent 1e13352c
...@@ -13,6 +13,8 @@ module Mutations ...@@ -13,6 +13,8 @@ module Mutations
if pipeline.cancelable? if pipeline.cancelable?
pipeline.cancel_running pipeline.cancel_running
pipeline.cancel
{ success: true, errors: [] } { success: true, errors: [] }
else else
{ success: false, errors: ['Pipeline is not cancelable'] } { success: false, errors: ['Pipeline is not cancelable'] }
......
...@@ -47,5 +47,6 @@ RSpec.describe 'PipelineCancel' do ...@@ -47,5 +47,6 @@ RSpec.describe 'PipelineCancel' do
expect(response).to have_gitlab_http_status(:success) expect(response).to have_gitlab_http_status(:success)
expect(build.reload).to be_canceled expect(build.reload).to be_canceled
expect(pipeline.reload).to be_canceled
end end
end end
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