Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/gitlab/import_export/relation_tree_restorer.rb b/lib/gitlab/import_export/relation_tree_restorer.rb
index 1797bbad51a..e0d6ade51c2 100644
--- a/lib/gitlab/import_export/relation_tree_restorer.rb
+++ b/lib/gitlab/import_export/relation_tree_restorer.rb
@@ -26,6 +26,7 @@ module Gitlab
         ActiveRecord::Base.uncached do
           ActiveRecord::Base.no_touching do
             update_params!
+            update_relation_hashes!
             create_relations!
           end
         end
@@ -217,6 +218,10 @@ module Gitlab
           excluded_keys: excluded_keys_for_relation(relation_key)
         }
       end
+
+      def update_relation_hashes!
+        @tree_hash['ci_pipelines']&.sort_by! { |hash| hash['id'] }
+      end
     end
   end
 end