diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-17 20:24:25 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-17 20:24:25 +0300 |
| commit | 694b290a2e1f85c62452835edde0a01348096935 (patch) | |
| tree | 63d30919f4b05abc78e21dc223413aee2ee40696 /app/views/shared/_ref_switcher.html.haml | |
| parent | b179af197e96ffb9439e9ffea4301023e1399522 (diff) | |
| parent | 8feab9494b65b2854175cfbcf595a103b36a45ea (diff) | |
[skip ci] Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/views/shared/_ref_switcher.html.haml')
| -rw-r--r-- | app/views/shared/_ref_switcher.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/shared/_ref_switcher.html.haml b/app/views/shared/_ref_switcher.html.haml index d4ef13131e1..064187d4a93 100644 --- a/app/views/shared/_ref_switcher.html.haml +++ b/app/views/shared/_ref_switcher.html.haml @@ -8,8 +8,13 @@ - @options && @options.each do |key, value| = hidden_field_tag key, value, id: nil .dropdown +<<<<<<< HEAD = dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: @ref, refs_url: refs_project_path(@project, sort: 'updated_desc'), field_name: 'ref', submit_form_on_click: true, visit: true }, { toggle_class: "js-project-refs-dropdown" } .dropdown-menu.dropdown-menu-selectable.git-revision-dropdown.dropdown-menu-paging{ class: ("dropdown-menu-right" if local_assigns[:align_right]) } +======= + = dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: @ref, refs_url: refs_project_path(@project, sort: 'updated_desc'), field_name: 'ref', submit_form_on_click: true, visit: true }, { toggle_class: "js-project-refs-dropdown qa-branches-select" } + .dropdown-menu.dropdown-menu-selectable.git-revision-dropdown.dropdown-menu-paging.qa-branches-dropdown{ class: ("dropdown-menu-align-right" if local_assigns[:align_right]) } +>>>>>>> master .dropdown-page-one = dropdown_title _("Switch branch/tag") = dropdown_filter _("Search branches and tags") |