projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/master' into origin-2228-check-filter-uuid-columns
[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 178b48f173d58e47b5c590149d8b7f966b872dec..40f2def5dcbfd3a7546e55e68ebfcdc3547f4961 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/jobs_controller.rb
@@
-57,7
+57,7
@@
class Arvados::V1::JobsController < ApplicationController
def cancel
reload_object_before_update
- @object.update_attributes cancelled_at: Time.now
+ @object.update_attributes
!
cancelled_at: Time.now
show
end