diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /lib/gitlab/seeder.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'lib/gitlab/seeder.rb')
-rw-r--r-- | lib/gitlab/seeder.rb | 11 |
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: |