Merge remote-tracking branch 'origin/master' into with-pipeline-view

1 files changed, 5 insertions, 6 deletions

diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index 6abeddeeae6..fadf5c62984 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -19,14 +19,17 @@
 module Ci
   class Commit < ActiveRecord::Base
     extend Ci::Model
-    include CiStatus
+    include Statuseable
 
     belongs_to :project, class_name: '::Project', foreign_key: :gl_project_id
     has_many :statuses, class_name: 'CommitStatus'
     has_many :builds, class_name: 'Ci::Build'
     has_many :trigger_requests, dependent: :destroy, class_name: 'Ci::TriggerRequest'
 
+    delegate :stages, to: :statuses
+
     validates_presence_of :sha
+    validates_presence_of :status
     validate :valid_commit_sha
 
     # Invalidate object and save if when touched
@@ -40,10 +43,6 @@ module Ci
       CommitStatus.where(commit: all).stages
     end
 
-    def stages
-      statuses.stages
-    end
-
     def project_id
       project.id
     end
@@ -82,7 +81,7 @@ module Ci
 
     def retryable?
       builds.latest.any? do |build|
-        build.failed? || build.retryable?
+        build.failed? && build.retryable?
       end
     end