projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11308: Merge branch 'master' into 11308-python3
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
jobs_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/jobs_controller.rb
b/services/api/app/controllers/arvados/v1/jobs_controller.rb
index 243f38b78cd74740e57a64f1cefe070eb0be6686..bca74cd55fecddd469a000eb4d41bcb666f344f9 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/jobs_controller.rb
@@
-46,7
+46,7
@@
class Arvados::V1::JobsController < ApplicationController
def cancel
reload_object_before_update
def cancel
reload_object_before_update
- @object.
update_attributes! state: Job::Cancelled
+ @object.
cancel cascade: params[:cascade]
show
end
show
end