diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-12-16 13:04:05 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-01-31 22:50:40 +0000 |
| commit | adc1a9abb5adbf746b492938cb11576753edcc7e (patch) | |
| tree | 278c9d97b96b7a93556426e85182a2d0af123df2 /config/initializers | |
| parent | b27371d89848b35a1be06e253d0958f723fc242f (diff) | |
| download | gitlab-ce-adc1a9abb5adbf746b492938cb11576753edcc7e.tar.gz | |
Re-add missing gitlab_on_standard_port
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index b938a9cdb2a..842ea94c5a4 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -5,8 +5,8 @@ class Settings < Settingslogic namespace Rails.env class << self - def on_standard_port?(config) - config.port.to_i == (config.https ? 443 : 80) + def gitlab_on_standard_port? + on_standard_port?(gitlab) end def host_without_www(url) @@ -87,6 +87,10 @@ class Settings < Settingslogic ] end + def on_standard_port?(config) + config.port.to_i == (config.https ? 443 : 80) + end + # Extract the host part of the given +url+. def host(url) url = url.downcase |