Merge branch 'ce-9445-kerberos-clone-url-is-no-longer-visible' into 'master'
Backport Kerberos clone URL to CE See merge request gitlab-org/gitlab-ce!25750
This commit is contained in:
commit
c9e5ce8dbd
2 changed files with 4 additions and 2 deletions
|
@ -7,7 +7,7 @@
|
||||||
= sprite_icon("arrow-down", css_class: "icon")
|
= 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
|
%ul.p-3.dropdown-menu.dropdown-menu-right.dropdown-menu-large.dropdown-menu-selectable.clone-options-dropdown.qa-clone-options
|
||||||
- if ssh_enabled?
|
- if ssh_enabled?
|
||||||
%li.pb-2
|
%li
|
||||||
%label.label-bold
|
%label.label-bold
|
||||||
= _('Clone with SSH')
|
= _('Clone with SSH')
|
||||||
.input-group
|
.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")
|
= 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'
|
= render_if_exists 'projects/buttons/geo'
|
||||||
- if http_enabled?
|
- if http_enabled?
|
||||||
%li
|
%li.pt-2
|
||||||
%label.label-bold
|
%label.label-bold
|
||||||
= _('Clone with %{http_label}') % { http_label: gitlab_config.protocol.upcase }
|
= _('Clone with %{http_label}') % { http_label: gitlab_config.protocol.upcase }
|
||||||
.input-group
|
.input-group
|
||||||
|
@ -24,5 +24,6 @@
|
||||||
.input-group-append
|
.input-group-append
|
||||||
= clipboard_button(target: '#http_project_clone', title: _("Copy URL to clipboard"), class: "input-group-text btn-default btn-clipboard")
|
= 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/geo'
|
||||||
|
= render_if_exists 'projects/buttons/kerberos_clone_field'
|
||||||
|
|
||||||
= render_if_exists 'shared/geo_info_modal', project: project
|
= render_if_exists 'shared/geo_info_modal', project: project
|
||||||
|
|
|
@ -13,3 +13,4 @@
|
||||||
- if http_enabled?
|
- if http_enabled?
|
||||||
%li
|
%li
|
||||||
= dropdown_item_with_description(http_copy_label, project.http_url_to_repo, href: project.http_url_to_repo, data: { clone_type: 'http' })
|
= 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'
|
||||||
|
|
Loading…
Reference in a new issue