Commit adc1a9ab authored by Kamil Trzcinski's avatar Kamil Trzcinski Committed by James Edwards-Jones

Re-add missing gitlab_on_standard_port

parent b27371d8
...@@ -5,8 +5,8 @@ class Settings < Settingslogic ...@@ -5,8 +5,8 @@ class Settings < Settingslogic
namespace Rails.env namespace Rails.env
class << self class << self
def on_standard_port?(config) def gitlab_on_standard_port?
config.port.to_i == (config.https ? 443 : 80) on_standard_port?(gitlab)
end end
def host_without_www(url) def host_without_www(url)
...@@ -87,6 +87,10 @@ class Settings < Settingslogic ...@@ -87,6 +87,10 @@ class Settings < Settingslogic
] ]
end end
def on_standard_port?(config)
config.port.to_i == (config.https ? 443 : 80)
end
# Extract the host part of the given +url+. # Extract the host part of the given +url+.
def host(url) def host(url)
url = url.downcase url = url.downcase
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment