Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-07-03 13:31:37 +0300
committerNick Thomas <nick@gitlab.com>2017-07-04 14:02:29 +0300
commitcb1f3423876f84861facc4c3631eeb4b453ceee6 (patch)
tree068a99a137ec3091f011910127a742c96611c01e /app/models/forked_project_link.rb
parent1501a4f578fa947af66a981fd56885be8467d5b5 (diff)
Don't resolve fork relationships for projects pending delete
Diffstat (limited to 'app/models/forked_project_link.rb')
-rw-r--r--app/models/forked_project_link.rb4
1 files changed, 2 insertions, 2 deletions
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