Merge branch 'master' into 3605-improved-dashboard

Conflicts:
	apps/workbench/app/models/job.rb
	services/api/app/models/job.rb

diff --cc apps/workbench/app/models/job.rb
index ff2eb00e7096957b9e77a5ba08702c0239524169,9e9c0967871ba4e6408a79c1855b87460f156694..1006660696d000f7ed8f85cfc63cc09148fe36e8
--- 1/apps/workbench/app/models/job.rb
--- 2/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@@ -34,28 -38,7 +38,31 @@@ class Job < ArvadosBas
      arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
    end
  
 +  def self.queue_size
 +    arvados_api_client.api("jobs/", "queue_size", {"_method"=> "GET"})[:queue_size] rescue 0
 +  end
 +
 +  def state
 +    Job::state(self)
 +  end
 +
 +  def self.state job
 +    if not job[:cancelled_at].nil?
 +      "Canceled"
 +    elsif not job[:finished_at].nil? or not job[:success].nil?
 +      if job[:success]
 +        "Completed"
 +      else
 +        "Failed"
 +      end
 +    elsif job[:running]
 +      "Running"
 +    else
 +      "Queued"
 +    end
 +  end
 +
+   def textile_attributes
+     [ 'description' ]
+   end
  end

diff --cc apps/workbench/app/views/pipeline_instances/show.html.erb
Simple merge

diff --cc services/api/app/models/job.rb
index 6e87bdaf8bcd95f0ed30901cc3d0b5ee54d626ea,32f28e3582d509930a4bdf3339659035f6d9b5d5..e142d8db08f82a1bc96a7d84559d7b3c36dec050
--- 1/services/api/app/models/job.rb
--- 2/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@@ -40,7 -40,7 +40,8 @@@ class Job < ArvadosMode
      t.add :repository
      t.add :supplied_script_version
      t.add :docker_image_locator
 +    t.add :queue_position
+     t.add :description
    end
  
    def assert_finished