diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
| commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
| tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /config/initializers/database_config.rb | |
| parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) | |
| download | gitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'config/initializers/database_config.rb')
| -rw-r--r-- | config/initializers/database_config.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb index 7aedf9013ae..1eb9d12812a 100644 --- a/config/initializers/database_config.rb +++ b/config/initializers/database_config.rb @@ -10,8 +10,6 @@ Gitlab.ee do end end -ActiveRecord::Base.establish_connection(Gitlab::Database.main.db_config_with_default_pool_size) - Gitlab.ee do if Gitlab::Runtime.sidekiq? && Gitlab::Geo.geo_database_configured? Rails.configuration.geo_database['pool'] = Gitlab::Database.default_pool_size |