diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-04-22 15:52:00 +0400 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-04-22 15:52:00 +0400 |
| commit | 7e10d01342e500e8bdf10051595020d1bb4bfd0b (patch) | |
| tree | ab40d68a3b6cd1f95f31ac1c5c49ef3d0c9aa54f /config | |
| parent | 52a247da5ec279ae2aa2113b9157be36f5eb812f (diff) | |
| parent | 4691285989000a8053c9540fa50ca95d3a00551d (diff) | |
Merge pull request #6782 from pkgr/allow-to-change-gitlab-config-location-via-env-variable
Allow to overwrite location of gitlab.yml config file.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 59564d9ea33..4e8b3f304d0 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -1,5 +1,5 @@ class Settings < Settingslogic - source "#{Rails.root}/config/gitlab.yml" + source ENV.fetch('GITLAB_CONFIG') { "#{Rails.root}/config/gitlab.yml" } namespace Rails.env class << self |