diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-03-17 14:16:47 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-03-17 17:08:10 +0100 |
| commit | 9a20ff1c99e0e73883d32438e50772635f0aed27 (patch) | |
| tree | c99d875ffeba6bbb587d8c9e388d29036e040c97 /lib/gitlab/database.rb | |
| parent | 7a623907528a77187e070c9721469df8bdd00ec8 (diff) | |
| download | gitlab-ce-9a20ff1c99e0e73883d32438e50772635f0aed27.tar.gz | |
Added Gitlab::Database.config
This returns the ActiveRecord configuration for the current environment.
While CE doesn't use this very often, EE will use it in a few places for
the database load balancing code. I'm adding this to CE so we don't end
up with merge conflicts in this file.
Diffstat (limited to 'lib/gitlab/database.rb')
| -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? |