kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Re-add missing gitlab_on_standard_port

This commit is contained in:
Kamil Trzcinski 2015-12-16 13:04:05 +01:00 committed by James Edwards-Jones
parent b27371d898
commit adc1a9abb5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/initializers/1_settings.rb
View File

@ -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