deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix port issue

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-07-03 18:52:48 +03:00
parent 00ef16a66c
commit 51f174b97f
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/mailers/notify.rb
View file

@ -4,7 +4,7 @@ class Notify < ActionMailer::Base
default_url_options[:host] = Gitlab.config.web_host default_url_options[:host] = Gitlab.config.web_host
default_url_options[:protocol] = Gitlab.config.web_protocol default_url_options[:protocol] = Gitlab.config.web_protocol
default_url_options[:port] = Gitlab.config.web_port default_url_options[:port] = Gitlab.config.web_port if Gitlab.config.web_custom_port?
default from: Gitlab.config.email_from default from: Gitlab.config.email_from

14
config/initializers/1_settings.rb
View file

@ -20,17 +20,25 @@ class Settings < Settingslogic
def web_port def web_port
if web.https if web.https
nil web['port'] = 443
else else
web['port'] ||= 80 web['port'] ||= 80
end end.to_i
end
def web_custom_port?
![443, 80].include?(web_port)
end end
def build_url def build_url
raw_url = self.web_protocol raw_url = self.web_protocol
raw_url << "://" raw_url << "://"
raw_url << web_host raw_url << web_host
raw_url << ":#{web_port}" if web_port.to_i != 80
if web_custom_port?
raw_url << ":#{web_port}"
end
raw_url raw_url
end end