diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-17 17:52:46 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-17 17:52:46 +0000 |
| commit | bbddd77086078198d4074335e9b76db7affb9d07 (patch) | |
| tree | 345cee426e9472fc32a339e1e70c8adc8df886d5 /lib | |
| parent | 5409a3c5b7cb1aa66de7a8702b862556d7d49298 (diff) | |
| parent | 9a20ff1c99e0e73883d32438e50772635f0aed27 (diff) | |
| download | gitlab-ce-bbddd77086078198d4074335e9b76db7affb9d07.tar.gz | |
Merge branch 'database-config-method' into 'master'
Added Gitlab::Database.config
See merge request !10045
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/database.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index f3f417c1a63..63b8d0d3b9d 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -5,8 +5,12 @@ module Gitlab # http://dev.mysql.com/doc/refman/5.7/en/integer-types.html MAX_INT_VALUE = 2147483647 + def self.config + ActiveRecord::Base.configurations[Rails.env] + end + def self.adapter_name - ActiveRecord::Base.configurations[Rails.env]['adapter'] + config['adapter'] end def self.mysql? |