diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-26 13:54:51 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-26 13:54:51 +0000 |
| commit | 68e312b20d7fa16ec924be7a7d10fc67ee0c4292 (patch) | |
| tree | 546df686bd5e5c19ab373c5a32c0b574730708c9 | |
| parent | 3a7c8918636c1628a1f6ec86c2932208a5eb070e (diff) | |
| parent | 70d155e87f3871cc0a87660e37d9daa6ef5320ea (diff) | |
| download | gitlab-ce-docs-test-2.tar.gz | |
Merge branch 'sh-fix-clone-geo-dropdown' into 'master'docs-test-2docs-test-1
Fix clone dropdown parent inheritance issues in HAML
See merge request gitlab-org/gitlab-ce!24029
| -rw-r--r-- | app/views/projects/buttons/_clone.html.haml | 24 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-clone-geo-dropdown.yml | 5 |
2 files changed, 17 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 diff --git a/changelogs/unreleased/sh-fix-clone-geo-dropdown.yml b/changelogs/unreleased/sh-fix-clone-geo-dropdown.yml new file mode 100644 index 00000000000..1c0cbdc3a2c --- /dev/null +++ b/changelogs/unreleased/sh-fix-clone-geo-dropdown.yml @@ -0,0 +1,5 @@ +--- +title: Fix clone dropdown parent inheritance issues in HAML +merge_request: 24029 +author: +type: fixed |