diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-04 11:43:45 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-04 11:43:45 -0500 |
| commit | 4b1d580a84016397bc1dfd0d089b8ed7ace9228d (patch) | |
| tree | 53103ac934607bd0196d76a2e60f3888b21f21d0 /app/views/shared/issuable/_search_bar.html.haml | |
| parent | dde9b6698bb67dc34650a588ad3e644843067800 (diff) | |
| download | gitlab-ce-4b1d580a84016397bc1dfd0d089b8ed7ace9228d.tar.gz | |
Fix FE conflicts
Diffstat (limited to 'app/views/shared/issuable/_search_bar.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index dd727f1abfb..f7b87171573 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -130,11 +130,7 @@ - field_name = "update[assignee_id]" = dropdown_tag("Assignee", options: { toggle_class: "js-user-search js-update-assignee js-filter-submit js-filter-bulk-update", title: "Assign to", filter: true, dropdown_class: "dropdown-menu-user dropdown-menu-selectable", -<<<<<<< HEAD - placeholder: "Search authors", data: { first_user: (current_user.username if current_user), null_user: true, current_user: true, project_id: @project.id, field_name: "update[assignee_id]", default_label: "Assignee" } }) -======= placeholder: "Search authors", data: { first_user: (current_user.username if current_user), null_user: true, current_user: true, project_id: @project.id, field_name: field_name } }) ->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master .filter-item.inline = dropdown_tag("Milestone", options: { title: "Assign milestone", toggle_class: 'js-milestone-select js-extra-options js-filter-submit js-filter-bulk-update', filter: true, dropdown_class: "dropdown-menu-selectable dropdown-menu-milestone", placeholder: "Search milestones", data: { show_no: true, field_name: "update[milestone_id]", project_id: @project.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :json), use_id: true, default_label: "Milestone" } }) .filter-item.inline.labels-filter |