Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/gitlab/ci/processable_object_hierarchy.rb b/lib/gitlab/ci/processable_object_hierarchy.rb
index 1122361e27e..c1531c3f4ab 100644
--- a/lib/gitlab/ci/processable_object_hierarchy.rb
+++ b/lib/gitlab/ci/processable_object_hierarchy.rb
@@ -20,12 +20,16 @@ module Gitlab
       def ancestor_conditions(cte)
         middle_table[:name].eq(objects_table[:name]).and(
           middle_table[:build_id].eq(cte.table[:id])
+        ).and(
+          objects_table[:commit_id].eq(cte.table[:commit_id])
         )
       end
 
       def descendant_conditions(cte)
         middle_table[:build_id].eq(objects_table[:id]).and(
           middle_table[:name].eq(cte.table[:name])
+        ).and(
+          objects_table[:commit_id].eq(cte.table[:commit_id])
         )
       end
     end