From 5d69f5b46d475f34fb71dfb4e8b683e90897f1da Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 31 Mar 2016 19:51:28 +0200
Subject: Use Ci::Commit as Pipeline

---
 app/models/ci/build.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'app/models/ci/build.rb')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 7d33838044b..15fc714b538 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -50,7 +50,6 @@ module Ci
 
     scope :unstarted, ->() { where(runner_id: nil) }
     scope :ignore_failures, ->() { where(allow_failure: false) }
-    scope :similar, ->(build) { where(ref: build.ref, tag: build.tag, trigger_request_id: build.trigger_request_id) }
 
     mount_uploader :artifacts_file, ArtifactUploader
     mount_uploader :artifacts_metadata, ArtifactUploader
@@ -62,6 +61,8 @@ module Ci
 
     before_destroy { project }
 
+    after_create :execute_hooks
+
     class << self
       def columns_without_lazy
         (column_names - LAZY_ATTRIBUTES).map do |column_name|
@@ -126,12 +127,16 @@ module Ci
     end
 
     def retried?
-      !self.commit.latest_statuses_for_ref(self.ref).include?(self)
+      !self.commit.latest.include?(self)
+    end
+
+    def retry
+      Ci::Build.retry(self)
     end
 
     def depends_on_builds
       # Get builds of the same type
-      latest_builds = self.commit.builds.similar(self).latest
+      latest_builds = self.commit.builds.latest
 
       # Return builds from previous stages
       latest_builds.where('stage_idx < ?', stage_idx)
-- 
cgit v1.2.3


From 4d72ca39803615850267d034e9dc59540fe657b7 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 13 Apr 2016 11:01:10 +0200
Subject: Remove the use of default scope for Builds

---
 app/models/ci/build.rb | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'app/models/ci/build.rb')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 15fc714b538..085ecc6951c 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -37,8 +37,6 @@
 
 module Ci
   class Build < CommitStatus
-    LAZY_ATTRIBUTES = ['trace']
-
     belongs_to :runner, class_name: 'Ci::Runner'
     belongs_to :trigger_request, class_name: 'Ci::TriggerRequest'
     belongs_to :erased_by, class_name: 'User'
@@ -56,20 +54,11 @@ module Ci
 
     acts_as_taggable
 
-    # To prevent db load megabytes of data from trace
-    default_scope -> { select(Ci::Build.columns_without_lazy) }
-
     before_destroy { project }
 
     after_create :execute_hooks
 
     class << self
-      def columns_without_lazy
-        (column_names - LAZY_ATTRIBUTES).map do |column_name|
-          "#{table_name}.#{column_name}"
-        end
-      end
-
       def last_month
         where('created_at > ?', Date.today - 1.month)
       end
-- 
cgit v1.2.3


From 2a7f7f75285e3818ac9c90b3e6c7893f4999e33e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 13 Apr 2016 20:51:03 +0200
Subject: Update handling of skipped status

---
 app/models/ci/build.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models/ci/build.rb')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 085ecc6951c..c0b334d3600 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -116,7 +116,7 @@ module Ci
     end
 
     def retried?
-      !self.commit.latest.include?(self)
+      !self.commit.statuses.latest.include?(self)
     end
 
     def retry
-- 
cgit v1.2.3