Merge branch 'origin-2939-re-run-job-button' into 2882-job-process-stats

diff --combined apps/workbench/app/models/job.rb
index 8dd66ed6b9296ed00396b8924f50d152388841ed,92f3910293695bb537959fbee02c2abd1c972e0e..173d3a06964fb5667b9546aee4bab518baf3c190
--- 1/apps/workbench/app/models/job.rb
--- 2/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@@ -3,15 -3,11 +3,15 @@@ class Job < ArvadosBas
      true
    end
  
-   def attribute_editable?(attr)
+   def attribute_editable? attr, *args
      false
    end
  
    def self.creatable?
      false
    end
 +
 +  def cancel
 +    arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
 +  end
  end