diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-20 17:52:20 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-20 17:52:20 +0000 |
commit | 42fc4233e56a9e4076fe8e26b4797a75d0acf5c0 (patch) | |
tree | a22c0f32b6967815db08f94d0534aa8e092d95d5 /app/views | |
parent | a4422a3a2efa983a2a7a21a806eb4e4c957e7be0 (diff) | |
parent | 7418429da19e25082b9f04af5873e339529ad3f9 (diff) | |
download | gitlab-ce-42fc4233e56a9e4076fe8e26b4797a75d0acf5c0.tar.gz |
Merge branch 'fix-default-http-clone' into 'master'
Make HTTP(s) label consistent on clone bar
Sites that use http:// for the external_url should always display HTTP on
the clone bar. Similarly, sites that use https:// should show HTTPS.
Currently, the inconsistency looks like:
![http-magic](/uploads/945fda580f7ba5aee36cc572b49baf2b/http-magic.gif)
Also restores the tooltips that vanished in 7ba4482fcf6:
![image](/uploads/b5a7b3e68b4992a447fcaa51915e866c/image.png)
See merge request !3319
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/shared/_clone_panel.html.haml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml index faf7e49ed29..974751d9970 100644 --- a/app/views/shared/_clone_panel.html.haml +++ b/app/views/shared/_clone_panel.html.haml @@ -8,11 +8,9 @@ = icon('angle-down') %ul.dropdown-menu.dropdown-menu-right.clone-options-dropdown %li - %a#ssh-selector{href: @project.ssh_url_to_repo} - SSH + = ssh_clone_button(project) %li - %a#http-selector{href: @project.http_url_to_repo} - HTTPS + = http_clone_button(project) = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true .input-group-btn |