diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2015-12-27 19:36:08 +0300 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2015-12-27 19:36:08 +0300 |
| commit | 4ebd447a056ad3af624814ac3094ce132d38b1e9 (patch) | |
| tree | 9d90c6e3c90822782f1e430f941025e1f8094659 /config | |
| parent | a52746649d1db4f52ae4e989dcf654ef4af57905 (diff) | |
Use environment variables to configure GitLab.
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 816cb0c02a9..c151ea01d55 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -144,7 +144,7 @@ Settings.gitlab['default_projects_limit'] ||= 10 Settings.gitlab['default_branch_protection'] ||= 2 Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil? Settings.gitlab['default_theme'] = Gitlab::Themes::APPLICATION_DEFAULT if Settings.gitlab['default_theme'].nil? -Settings.gitlab['host'] ||= 'localhost' +Settings.gitlab['host'] ||= ENV['GITLAB_HOST'] || 'localhost' Settings.gitlab['ssh_host'] ||= Settings.gitlab.host Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 |