diff --git a/app/views/blame/_head.html.haml b/app/views/blame/_head.html.haml
index 3b027bdaf18eb9fcf052d27b6721b75651e00d6f..175719b1199aa9d2d192d41cc34db7ed7f6bba82 100644
--- a/app/views/blame/_head.html.haml
+++ b/app/views/blame/_head.html.haml
@@ -6,5 +6,5 @@
%li.right
.input-prepend.project_clone_holder
%button{class: "btn small active", :"data-clone" => @project.ssh_url_to_repo} SSH
- %button{class: "btn small", :"data-clone" => @project.http_url_to_repo} HTTP
+ %button{class: "btn small", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.web_protocol.upcase
= text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select span5"
diff --git a/app/views/projects/_clone_panel.html.haml b/app/views/projects/_clone_panel.html.haml
index 20891610ace12d7da89d355eb3bdb40e760eb6bd..4411ff1734b1823ffd8dfe2ee8f66ea6ad71290b 100644
--- a/app/views/projects/_clone_panel.html.haml
+++ b/app/views/projects/_clone_panel.html.haml
@@ -4,7 +4,7 @@
.form-horizontal
.input-prepend.project_clone_holder
%button{class: "btn small active", :"data-clone" => @project.ssh_url_to_repo} SSH
- %button{class: "btn small", :"data-clone" => @project.http_url_to_repo} HTTP
+ %button{class: "btn small", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.web_protocol.upcase
= text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select span5"
.span4.right
.right
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 276707a73af9febdf6bc5890c31612f4910177ca..fb80963655758b0f5edd7501d9db6a096015a12a 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -31,15 +31,17 @@ class Settings < Settingslogic
end
def build_url
- raw_url = self.web_protocol
- raw_url << "://"
- raw_url << web_host
-
if web_custom_port?
- raw_url << ":#{web_port}"
+ custom_port = ":#{web_port}"
+ else
+ custom_port = nil
end
-
- raw_url
+ [
+ web_protocol,
+ "://",
+ web_host,
+ custom_port
+ ].join('')
end
def ssh_port