diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-22 19:30:59 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-22 19:30:59 +0000 |
| commit | 4896d49a25e9b96f50a52d1dc674efe730fcf1ac (patch) | |
| tree | 328903a869cdad8efd224c1f9ce09be1cae3e00d | |
| parent | 6500ee143dfd80e033547f06651f7b13c48270b9 (diff) | |
| parent | 33489f29f331901bff4551a874e78c86a4f6683c (diff) | |
| download | gitlab-ce-4896d49a25e9b96f50a52d1dc674efe730fcf1ac.tar.gz | |
Merge branch 'fix-milestone-assign' into 'master'
Fixes issue with assign milestone not loading milestone list
cc. @jschatz1
See merge request !3346
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index ac20f7d1f7e..53952e608ea 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -42,7 +42,7 @@ 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]" } }) .filter-item.inline = dropdown_tag("Milestone", options: { title: "Assign milestone", toggle_class: 'js-milestone-select', filter: true, dropdown_class: "dropdown-menu-selectable", - placeholder: "Search milestones", data: { show_no: true, field_name: "update[milestone_id]", project_id: @project.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :js), use_id: true } }) + 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 } }) = hidden_field_tag 'update[issues_ids]', [] = hidden_field_tag :state_event, params[:state_event] .filter-item.inline |