diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-08-03 12:16:45 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-08-04 15:38:49 +0200 |
| commit | 3899d07f9eb5ffa2369195c800be18e297f67613 (patch) | |
| tree | 5a8e252d127878f4057ec884f3407874b86645d4 /config/initializers | |
| parent | 0fa94a0dddfc38635abf49a38dbadc9b9ead4d7a (diff) | |
| download | gitlab-ce-3899d07f9eb5ffa2369195c800be18e297f67613.tar.gz | |
Move hostname to Gitlab::Environment
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 017537f30be..7a43bf939ea 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -222,7 +222,6 @@ Settings.gitlab['default_branch_protection'] ||= 2 Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil? Settings.gitlab['host'] ||= ENV['GITLAB_HOST'] || 'localhost' Settings.gitlab['ssh_host'] ||= Settings.gitlab.host -Settings.gitlab['hostname'] ||= ENV['HOSTNAME'] || Socket.gethostname Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? Settings.gitlab['port'] ||= ENV['GITLAB_PORT'] || (Settings.gitlab.https ? 443 : 80) Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || '' |