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/projects/boards | |
| parent | dde9b6698bb67dc34650a588ad3e644843067800 (diff) | |
| download | gitlab-ce-4b1d580a84016397bc1dfd0d089b8ed7ace9228d.tar.gz | |
Fix FE conflicts
Diffstat (limited to 'app/views/projects/boards')
| -rw-r--r-- | app/views/projects/boards/components/sidebar/_assignee.html.haml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/views/projects/boards/components/sidebar/_assignee.html.haml b/app/views/projects/boards/components/sidebar/_assignee.html.haml index 96f7f12b1d7..0c09e71feee 100644 --- a/app/views/projects/boards/components/sidebar/_assignee.html.haml +++ b/app/views/projects/boards/components/sidebar/_assignee.html.haml @@ -16,11 +16,7 @@ "v-if" => "issue.assignees", "v-for" => "assignee in issue.assignees" } .dropdown -<<<<<<< HEAD - %button.dropdown-menu-toggle.js-user-search.js-author-search.js-issue-board-sidebar{ type: "button", data: { toggle: "dropdown", field_name: "issue[assignee_id]", first_user: (current_user.username if current_user), current_user: "true", project_id: @project.id, null_user: "true", null_user_default: "true" }, -======= %button.dropdown-menu-toggle.js-user-search.js-author-search.js-multiselect.js-save-user-data.js-issue-board-sidebar{ type: "button", ref: "assigneeDropdown", data: { toggle: "dropdown", field_name: "issue[assignee_ids][]", first_user: (current_user.username if current_user), current_user: "true", project_id: @project.id, null_user: "true", multi_select: "true", dropdown: { header: 'Assignee(s)'} }, ->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master ":data-issuable-id" => "issue.id", ":data-selected" => "assigneeId", ":data-issue-update" => "'#{namespace_project_issues_path(@project.namespace, @project)}/' + issue.id + '.json'" } |