Merge branch 'fix/test' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce

Former-commit-id: e322bdbd

app/mailers/notify.rb

@@ -12,7 +12,7 @@ class Notify < ActionMailer::Base
   default_url_options[:host]     = Gitlab.config.gitlab.host
   default_url_options[:protocol] = Gitlab.config.gitlab.protocol
-  default_url_options[:port]     = Gitlab.config.gitlab.port if Gitlab.config.gitlab_on_non_standard_port?
+  default_url_options[:port]     = Gitlab.config.gitlab.port unless Gitlab.config.gitlab_on_standard_port?
   default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root
   default from: Gitlab.config.gitlab.email_from

config/initializers/1_settings.rb

@@ -3,8 +3,8 @@ class Settings < Settingslogic
   namespace Rails.env
   class << self
-    def gitlab_on_non_standard_port?
-      ![443, 80].include?(gitlab.port.to_i)
+    def gitlab_on_standard_port?
+      gitlab.port.to_i == (gitlab.https ? 443 : 80)
     end
     private
@@ -18,11 +18,7 @@ class Settings < Settingslogic
     end
     def build_gitlab_url
-      if gitlab_on_non_standard_port?
-        custom_port = ":#{gitlab.port}"
-      else
-        custom_port = nil
-      end
+      custom_port = gitlab_on_standard_port? ? nil : ":#{gitlab.port}"
       [ gitlab.protocol,
         "://",
         gitlab.host,

spec/models/project_spec.rb

@@ -101,7 +101,7 @@ describe Project do
   it "returns the web URL without the protocol for this repo" do
     project = Project.new(path: "somewhere")
-    project.web_url_without_protocol.should == "#{Gitlab.config.gitlab.host}/somewhere"
+    project.web_url_without_protocol.should == "#{Gitlab.config.gitlab.url.split("://")[1]}/somewhere"
   end
   describe "last_activity methods" do