diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-14 11:23:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-14 11:23:34 +0000 |
| commit | eb0ac2b9ba728762c086c59988d2ab24bbd7806e (patch) | |
| tree | 291e9b16b117203d5dfd909ddbe5c109e63522f2 /lib | |
| parent | 478e01ce7b38cdbdff8bd2b7138abd31cf1c37f9 (diff) | |
| parent | 581cfbae24d629433e2e4eb6f6a2bb2a2938cada (diff) | |
| download | gitlab-ce-eb0ac2b9ba728762c086c59988d2ab24bbd7806e.tar.gz | |
Merge branch 'fix-ar-connection-leaks' into 'master'
Fix ActiveRecord connection leaks
Closes #27949 and gitlab-com/infrastructure#1139
See merge request !9109
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/database.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index dc2537d36aa..a3d6be9959b 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -6,7 +6,7 @@ module Gitlab MAX_INT_VALUE = 2147483647 def self.adapter_name - connection.adapter_name + ActiveRecord::Base.configurations[Rails.env]['adapter'] end def self.mysql? |