From cb1f3423876f84861facc4c3631eeb4b453ceee6 Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Mon, 3 Jul 2017 11:31:37 +0100 Subject: Don't resolve fork relationships for projects pending delete --- app/models/forked_project_link.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/models/forked_project_link.rb') diff --git a/app/models/forked_project_link.rb b/app/models/forked_project_link.rb index 36cf7ad6a28..8d35864eff6 100644 --- a/app/models/forked_project_link.rb +++ b/app/models/forked_project_link.rb @@ -1,4 +1,4 @@ class ForkedProjectLink < ActiveRecord::Base - belongs_to :forked_to_project, class_name: 'Project' - belongs_to :forked_from_project, class_name: 'Project' + belongs_to :forked_to_project, -> { where.not(pending_delete: true) }, class_name: 'Project' + belongs_to :forked_from_project, -> { where.not(pending_delete: true) }, class_name: 'Project' end -- cgit v1.2.1