15345: Merge branch 'master' into 15345-kill-container-api

[arvados.git] / services / api / app / controllers / arvados / v1 / pipeline_instances_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/pipeline_instances_controller.rb b/services/api/app/controllers/arvados/v1/pipeline_instances_controller.rb
index 9781caf7e8183f618d33971335ed4d6e38a23ab3..baffda1c99b96ad72e81879c1fff9d124ef2635c 100644 (file)
--- a/services/api/app/controllers/arvados/v1/pipeline_instances_controller.rb
+++ b/services/api/app/controllers/arvados/v1/pipeline_instances_controller.rb
@@ -1,5 +1,15 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class Arvados::V1::PipelineInstancesController < ApplicationController
-  accept_attribute_as_json :components_summary, Hash
   accept_attribute_as_json :components, Hash
   accept_attribute_as_json :properties, Hash
+  accept_attribute_as_json :components_summary, Hash
+
+  def cancel
+    reload_object_before_update
+    @object.cancel cascade: params[:cascade]
+    show
+  end
 end