diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-26 01:44:16 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2018-12-26 12:50:58 +0300 |
| commit | 9e3f9f751b78efe8dbe70f07cd583be3eea3c56d (patch) | |
| tree | d2dd664fde050727d368c5ceaeb2e692b8adc598 /app | |
| parent | 5dc656fc1f053d397ad1e6c1d85a815f03a5d634 (diff) | |
Fix clone dropdown parent inheritance issues in HAML
The change in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24015
caused some parent relationships to be incorrect. This caused a failure
in the EE failure the Geo button was added because the modal stopped
showing.
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/buttons/_clone.html.haml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/app/views/projects/buttons/_clone.html.haml b/app/views/projects/buttons/_clone.html.haml index 53d427ec40a..159d9e44e17 100644 --- a/app/views/projects/buttons/_clone.html.haml +++ b/app/views/projects/buttons/_clone.html.haml @@ -5,18 +5,18 @@ %span.append-right-4.js-clone-dropdown-label = _('Clone') = sprite_icon("arrow-down", css_class: "icon") - %form.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 - %label.label-bold - = _('Clone with SSH') - .input-group - = text_field_tag :ssh_project_clone, project.ssh_url_to_repo, class: "js-select-on-focus form-control qa-ssh-clone-url", readonly: true, aria: { label: 'Project clone URL' } - .input-group-append - = 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' - %li - - if http_enabled? + %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 + %label.label-bold + = _('Clone with SSH') + .input-group + = text_field_tag :ssh_project_clone, project.ssh_url_to_repo, class: "js-select-on-focus form-control qa-ssh-clone-url", readonly: true, aria: { label: 'Project clone URL' } + .input-group-append + = 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 %label.label-bold = _('Clone with %{http_label}') % { http_label: gitlab_config.protocol.upcase } .input-group |