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

Disable issues sort. Recent issues on top. Fixed tests

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-07-02 21:51:48 +03:00
parent e00390b377
commit a2eda66b30
12 changed files with 29 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

11
config/initializers/1_settings.rb
View file

@ -3,7 +3,7 @@ class Settings < Settingslogic
class << self
def web_protocol
self.web['protocol'] ||= web.https ? "https://" : "http://"
self.web['protocol'] ||= web.https ? "https" : "http"
end
def web_host
@ -18,10 +18,15 @@ class Settings < Settingslogic
self['url'] ||= build_url
end
def web_port
web['port'] ||= 80
end
def build_url
raw_url = self.web_protocol
raw_url << web.host
raw_url << ":#{web.port}" if web.port.to_i != 80
raw_url << "://"
raw_url << web_host
raw_url << ":#{web_port}" if web_port.to_i != 80
raw_url
end