diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-15 07:36:40 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-15 07:36:40 +0000 |
| commit | bd652b6d14824c3541f1bc97e4a5e922ae5d01fd (patch) | |
| tree | 28924eb25dbc1a2accb2977c848e423e1fdf9e59 | |
| parent | 8bd1f37c36cf778af4820bd4eeec30e013e80421 (diff) | |
| parent | e4f5bc8c6e7a587aacd9c38e058c1b9674e21511 (diff) | |
| download | gitlab-ce-bd652b6d14824c3541f1bc97e4a5e922ae5d01fd.tar.gz | |
Merge branch 'clone-panel-scb' into 'master'
Resolve CE/EE diffs in _clone_panel
See merge request gitlab-org/gitlab-ce!28309
| -rw-r--r-- | app/views/shared/_clone_panel.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml index a2df0347fd6..1e509ea0d1f 100644 --- a/app/views/shared/_clone_panel.html.haml +++ b/app/views/shared/_clone_panel.html.haml @@ -16,7 +16,12 @@ = ssh_clone_button(project) %li = http_clone_button(project) + = render_if_exists 'shared/kerberos_clone_button', project: project = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true, aria: { label: 'Project clone URL' } .input-group-append = clipboard_button(target: '#project_clone', title: _("Copy URL to clipboard"), class: "input-group-text btn-default btn-clipboard") + + = render_if_exists 'shared/geo_modal_button' + += render_if_exists 'shared/geo_modal', project: project |