summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-07-03 18:34:47 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-07-03 18:34:47 +0300
commit00ef16a66c3865e534004d236052f8b13f5a6735 (patch)
treeab0a0d09a2444eb4f9b0ff30cbe4667b1c6ba41a
parentabc360fea3658c24e71c3cdd13da70a4dede3599 (diff)
downloadgitlab-ce-00ef16a66c3865e534004d236052f8b13f5a6735.tar.gz
Setting: Disable port if https
-rw-r--r--config/initializers/1_settings.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index a3b9ddd02a0..fb039e9e710 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -19,7 +19,11 @@ class Settings < Settingslogic
end
def web_port
- web['port'] ||= 80
+ if web.https
+ nil
+ else
+ web['port'] ||= 80
+ end
end
def build_url