Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index a269b8d0366..75738a62305 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -352,11 +352,11 @@ module Gitlab
       end
     end
 
-    def self.dbname(ar_connection)
+    def self.db_config_name(ar_connection)
       if ar_connection.respond_to?(:pool) &&
           ar_connection.pool.respond_to?(:db_config) &&
-          ar_connection.pool.db_config.respond_to?(:database)
-        return ar_connection.pool.db_config.database
+          ar_connection.pool.db_config.respond_to?(:name)
+        return ar_connection.pool.db_config.name
       end
 
       'unknown'