Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'

Don't try to create fork network memberships for forks of forks

Closes #40072

See merge request gitlab-org/gitlab-ce!15366

1 files changed, 11 insertions, 1 deletions

diff --git a/lib/gitlab/background_migration/create_fork_network_memberships_range.rb b/lib/gitlab/background_migration/create_fork_network_memberships_range.rb
index c88eb9783ed..67a39d28944 100644
--- a/lib/gitlab/background_migration/create_fork_network_memberships_range.rb
+++ b/lib/gitlab/background_migration/create_fork_network_memberships_range.rb
@@ -51,10 +51,20 @@ module Gitlab
             FROM projects
             WHERE forked_project_links.forked_from_project_id = projects.id
           )
+          AND NOT EXISTS (
+            SELECT true
+            FROM forked_project_links AS parent_links
+            WHERE parent_links.forked_to_project_id = forked_project_links.forked_from_project_id
+            AND NOT EXISTS (
+              SELECT true
+              FROM projects
+              WHERE parent_links.forked_from_project_id = projects.id
+            )
+          )
           AND forked_project_links.id BETWEEN #{start_id} AND #{end_id}
         MISSING_MEMBERS
 
-        ForkNetworkMember.count_by_sql(count_sql) > 0
+        ForkedProjectLink.count_by_sql(count_sql) > 0
       end
 
       def log(message)