From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Mon, 9 Jun 2014 13:09:20 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into 2961-load-tab-partials
X-Git-Tag: 1.1.0~2566^2~14
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/879e1f31b0165c6abaa35a023ff66400757bb44b

Merge remote-tracking branch 'origin/master' into 2961-load-tab-partials
---

879e1f31b0165c6abaa35a023ff66400757bb44b
diff --cc apps/workbench/app/controllers/jobs_controller.rb
index 03d5cb3827,841d3a9fdc..dc31229189
--- a/apps/workbench/app/controllers/jobs_controller.rb
+++ b/apps/workbench/app/controllers/jobs_controller.rb
@@@ -29,13 -27,17 +29,18 @@@ class JobsController < ApplicationContr
        generate_provenance(@objects)
      else
        @limit = 20
 -      super
      end
 +    super
    end
  
+   def cancel
+     @object.cancel
+     redirect_to @object
+   end
+ 
    def show
      generate_provenance([@object])
 +    super
    end
  
    def index_pane_list