Commit 725f30d0 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Re-add missing gitlab_on_standard_port

parent 23272ee1
...@@ -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
# get host without www, thanks to http://stackoverflow.com/a/6674363/1233435 # get host without www, thanks to http://stackoverflow.com/a/6674363/1233435
...@@ -115,6 +115,10 @@ class Settings < Settingslogic ...@@ -115,6 +115,10 @@ class Settings < Settingslogic
custom_port custom_port
] ]
end end
def on_standard_port?(config)
config.port.to_i == (config.https ? 443 : 80)
end
end end
end end
......
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