Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/gitlab/seeder.rb b/lib/gitlab/seeder.rb
index e26d45e1b33..4158cec9b09 100644
--- a/lib/gitlab/seeder.rb
+++ b/lib/gitlab/seeder.rb
@@ -87,7 +87,9 @@ module Gitlab
 
       SeedFu.quiet = true
 
-      yield
+      without_statement_timeout do
+        yield
+      end
 
       SeedFu.quiet = false
       ActiveRecord::Base.logger = old_logger
@@ -114,6 +116,13 @@ module Gitlab
     def self.mute_mailer
       ActionMailer::MessageDelivery.prepend(DeliverNever)
     end
+
+    def self.without_statement_timeout
+      ActiveRecord::Base.connection.execute('SET statement_timeout=0')
+      yield
+    ensure
+      ActiveRecord::Base.connection.execute('RESET statement_timeout')
+    end
   end
 end
 # :nocov: