diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-01 03:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-01 03:09:48 +0300 |
| commit | 0dc67904c1b8b01e7406fc510cf432c5bfc919fb (patch) | |
| tree | 93fffcf04b7d5ef50291c9d6386e6dd5f199dcef /config/initializers | |
| parent | 915ce2e09259d71275f3e0a6e5214b793c2eb52e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/load_balancing.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/config/initializers/load_balancing.rb b/config/initializers/load_balancing.rb index 290481f7296..bcc62a6be5d 100644 --- a/config/initializers/load_balancing.rb +++ b/config/initializers/load_balancing.rb @@ -2,15 +2,6 @@ Gitlab::Application.configure do |config| config.middleware.use(Gitlab::Database::LoadBalancing::RackMiddleware) - - # We need re-rerun the setup when code reloads in development - config.reloader.to_prepare do - if Rails.env.development? || Rails.env.test? - Gitlab::Database::LoadBalancing.base_models.each do |model| - Gitlab::Database::LoadBalancing::Setup.new(model).setup - end - end - end end Gitlab::Database::LoadBalancing.base_models.each do |model| @@ -23,8 +14,9 @@ Gitlab::Database::LoadBalancing.base_models.each do |model| # information. Gitlab::Database::LoadBalancing::Setup.new(model).setup + # We need re-rerun the setup when code reloads in development Rails.application.reloader.to_prepare do - if Rails.env.development? + if Rails.env.development? || Rails.env.test? Gitlab::Database::LoadBalancing::Setup.new(model).setup end end |