diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-18 14:26:11 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-18 14:26:11 +1100 |
| commit | 2047991363844b4f17216f94778b432ed198a412 (patch) | |
| tree | 6b90710c44dae00178ad323d796beb59737f47f1 /app/models/forked_project_link.rb | |
| parent | 7a1c5ba7471b233c994f5b5b313085d0d1292b5d (diff) | |
| parent | f3203cbbc25586df622552153cc460d2f79f414e (diff) | |
| download | gitlab-ce-2047991363844b4f17216f94778b432ed198a412.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/models/forked_project_link.rb')
| -rw-r--r-- | app/models/forked_project_link.rb | 4 |
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 |