diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-10-21 07:24:59 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-10-21 07:24:59 -0700 |
| commit | 4e363c613680230dc8f84169f4ad9c348c9f2826 (patch) | |
| tree | 4361b4b23c857a927acadd130622ba46bb45337b | |
| parent | 2ff36e74eba44b7a972fdb21774f45a27492e69e (diff) | |
| parent | d75cc7eafd980198e6f7484ded56c148ea96479f (diff) | |
| download | gitlab-ce-4e363c613680230dc8f84169f4ad9c348c9f2826.tar.gz | |
Merge pull request #1605 from dosire/repo_clone_indicator
Rewrite build_url, use web_protocol for repo indicator.
| -rw-r--r-- | app/views/blame/_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/_clone_panel.html.haml | 2 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 16 |
3 files changed, 11 insertions, 9 deletions
diff --git a/app/views/blame/_head.html.haml b/app/views/blame/_head.html.haml index 3b027bdaf18..175719b1199 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 20891610ace..4411ff1734b 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 276707a73af..fb809636557 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 |