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

diff --cc apps/workbench/app/controllers/application_controller.rb
Simple merge

diff --cc apps/workbench/app/controllers/jobs_controller.rb
index 03d5cb38275a3d9361eee366430ed8208dd7ab04,841d3a9fdc6827486a7f54948e6c63ee4b3b5b1a..dc31229189e9a7be5636eb38ec58f9aa510aec0e
--- 1/apps/workbench/app/controllers/jobs_controller.rb
--- 2/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