diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-18 00:22:42 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-18 00:22:42 +0300 |
| commit | b1a7e94399713649c1c534863dd420772e10acdb (patch) | |
| tree | 1665dc5c5b6c59a08ebd68c8c708143e255d9094 /app/views/shared/_ref_switcher.html.haml | |
| parent | 65f4cb3733ce9a7920b15e82112f3019fc216b3f (diff) | |
Fix conflict
Diffstat (limited to 'app/views/shared/_ref_switcher.html.haml')
| -rw-r--r-- | app/views/shared/_ref_switcher.html.haml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/views/shared/_ref_switcher.html.haml b/app/views/shared/_ref_switcher.html.haml index 064187d4a93..f1c39b9e923 100644 --- a/app/views/shared/_ref_switcher.html.haml +++ b/app/views/shared/_ref_switcher.html.haml @@ -8,13 +8,8 @@ - @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") |