diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-03-06 07:55:15 +0000 |
|---|---|---|
| committer | Dennis Tang <750946-dennis@users.noreply.gitlab.com> | 2019-03-06 08:38:54 +0000 |
| commit | 9f50e2f72132d92e5e49f486aa6a1670925f3ceb (patch) | |
| tree | e0f24a96cd7755165156883804f5ca7df94f49fb | |
| parent | 657d5085256165ceaeb443891f8e14eeba82aaba (diff) | |
| download | gitlab-ce-cherry-pick-c9e5ce8d.tar.gz | |
Merge branch 'ce-9445-kerberos-clone-url-is-no-longer-visible' into 'master'cherry-pick-c9e5ce8d
Backport Kerberos clone URL to CE
See merge request gitlab-org/gitlab-ce!25750
(cherry picked from commit c9e5ce8dbd25203484b43c48f0a55a5d7bf396e8)
c0a97cf5 Backport Kerberos clone URL to CE
| -rw-r--r-- | app/views/projects/buttons/_clone.html.haml | 5 | ||||
| -rw-r--r-- | app/views/shared/_mobile_clone_panel.html.haml | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/buttons/_clone.html.haml b/app/views/projects/buttons/_clone.html.haml index 159d9e44e17..09f05b30433 100644 --- a/app/views/projects/buttons/_clone.html.haml +++ b/app/views/projects/buttons/_clone.html.haml @@ -7,7 +7,7 @@ = sprite_icon("arrow-down", css_class: "icon") %ul.p-3.dropdown-menu.dropdown-menu-right.dropdown-menu-large.dropdown-menu-selectable.clone-options-dropdown.qa-clone-options - if ssh_enabled? - %li.pb-2 + %li %label.label-bold = _('Clone with SSH') .input-group @@ -16,7 +16,7 @@ = clipboard_button(target: '#ssh_project_clone', title: _("Copy URL to clipboard"), class: "input-group-text btn-default btn-clipboard") = render_if_exists 'projects/buttons/geo' - if http_enabled? - %li + %li.pt-2 %label.label-bold = _('Clone with %{http_label}') % { http_label: gitlab_config.protocol.upcase } .input-group @@ -24,5 +24,6 @@ .input-group-append = clipboard_button(target: '#http_project_clone', title: _("Copy URL to clipboard"), class: "input-group-text btn-default btn-clipboard") = render_if_exists 'projects/buttons/geo' + = render_if_exists 'projects/buttons/kerberos_clone_field' = render_if_exists 'shared/geo_info_modal', project: project diff --git a/app/views/shared/_mobile_clone_panel.html.haml b/app/views/shared/_mobile_clone_panel.html.haml index 6e2527bd1a1..1e6b6f7c79b 100644 --- a/app/views/shared/_mobile_clone_panel.html.haml +++ b/app/views/shared/_mobile_clone_panel.html.haml @@ -13,3 +13,4 @@ - if http_enabled? %li = dropdown_item_with_description(http_copy_label, project.http_url_to_repo, href: project.http_url_to_repo, data: { clone_type: 'http' }) + = render_if_exists 'shared/mobile_kerberos_clone' |