Merge branch 'fix/project-destroy-callbacks' into 'master'

Fix project destroy callback See gitlab-org/gitlab-ee!107. See merge request !2307

Merge branch 'fix/project-destroy-callbacks' into 'master'
8b39b8cd · Douwe Maan · 7884a261 · db2d067e · 8b39b8cd
Commit 8b39b8cd authored Jan 06, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

build.rb app/models/ci/build.rb +2 -4

No files found.
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -54,6 +54,8 @@ module Ci
    # To prevent db load megabytes of data from trace
    default_scope -> { select(Ci::Build.columns_without_lazy) }

+    before_destroy { project }
+
    class << self
      def columns_without_lazy
        (column_names - LAZY_ATTRIBUTES).map do |column_name|
@@ -145,10 +147,6 @@ module Ci
      end
    end

-    def project
-      commit.project
-    end
-
    def project_id
      commit.project.id
    end