Merge branch 'master' into 2903-remove-pi-active-and-success

Conflicts:
	services/api/db/schema.rb

diff --cc services/api/app/models/pipeline_instance.rb
index f83d43660737710e4c75082aeade0baac6b0dc16,7bb814c60d4a902d15a61485952ead0437a96cbe..354c8924e78f691cce4f327edb75ca37ec261f71
--- 1/services/api/app/models/pipeline_instance.rb
--- 2/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@@ -8,7 -8,7 +8,7 @@@ class PipelineInstance < ArvadosMode
    belongs_to :pipeline_template, :foreign_key => :pipeline_template_uuid, :primary_key => :uuid
  
    before_validation :bootstrap_components
-   before_validation :update_status
 -  before_validation :update_success
++  before_validation :update_state
    before_validation :verify_status
    before_create :set_state_before_save
    before_save :set_state_before_save
@@@ -109,9 -111,9 +109,9 @@@
      end
    end
  
-   def update_status
 -  def update_success
++  def update_state
      if components and progress_ratio == 1.0
 -      self.success = true
 +      self.state = Complete
      end
    end
  
@@@ -158,9 -211,13 +158,9 @@@
    end
  
    def set_state_before_save
-       if self.components_look_ready? && (!self.state || self.state == New)
 -    if !self.state || self.state == New || self.state == Ready || self.state == Paused
 -      if self.active
 -        self.state = RunningOnServer
 -      elsif self.components_look_ready? && (!self.state || self.state == New)
--        self.state = Ready
--      end
++    if self.components_look_ready? && (!self.state || self.state == New)
++      self.state = Ready
+     end
    end
  
  end

diff --cc services/api/db/schema.rb
Simple merge