Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-02-13 19:11:50 +0300
committerYorick Peterse <yorickpeterse@gmail.com>2017-02-13 19:13:02 +0300
commit581cfbae24d629433e2e4eb6f6a2bb2a2938cada (patch)
tree79455eb42c910dd0dc230dda8dc4268d1ebb5bbc /lib/gitlab/database.rb
parent58131ac93c2a7c784c8c4f9025ef250eac4e1fa1 (diff)
Don't connect in Gitlab::Database.adapter_name
We don't need to connect when requesting the name of the database adapter. This in turn should prevent us from requesting/leaking connections just by asking whether we're using PostgreSQL or MySQL.
Diffstat (limited to 'lib/gitlab/database.rb')
-rw-r--r--lib/gitlab/database.rb2
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?