diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-22 19:30:59 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-23 12:32:20 +0100 |
| commit | e5abd96c336cb0ad4b13339cbe6428adf7a8cbf9 (patch) | |
| tree | bcba2c861e7b78fc33a9375a909bb635b6b54da1 | |
| parent | 05856199031e869e7c60b5da8b949ccbcecec0cb (diff) | |
| download | gitlab-ce-e5abd96c336cb0ad4b13339cbe6428adf7a8cbf9.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-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index a0c55ebe8ef..7bc5ecd5bf8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ v 8.6.1 (unreleased) - Fixes issue with signin button overflowing on mobile. !3342 - Auto collapses the navigation sidebar when resizing. !3343 - Shows error messages when trying to create label in dropdown menu. !3345 + - Fixes issue with assign milestone not loading milestone list. !3346 v 8.6.0 - Add ability to move issue to another project 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 |