Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-17 21:29:12 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-06-17 23:03:39 +0300
commit0d21f8c3982e99f7851f7615b6c816086fbf441f (patch)
tree333069f8255b2d37cc6380dd68eaa13cbee5d3e1 /app/views/shared/issuable
parent989b094f426cbdf8f51907ca1bef6f10ad23489b (diff)
Merge branch 'assignee-dropdown-selected' into 'master'
Fixed issue with assignee dropdown not selecting correctly ## What does this MR do? Fixes an issue with assignee dropdown not selecting correctly. See merge request !4762
Diffstat (limited to 'app/views/shared/issuable')
-rw-r--r--app/views/shared/issuable/_filter.html.haml2
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 380ab465bf4..094d6636c66 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -12,7 +12,7 @@
- if params[:author_id].present?
= hidden_field_tag(:author_id, params[:author_id])
= dropdown_tag(user_dropdown_label(params[:author_id], "Author"), options: { toggle_class: "js-user-search js-filter-submit js-author-search", title: "Filter by author", filter: true, dropdown_class: "dropdown-menu-user dropdown-menu-selectable dropdown-menu-author js-filter-submit",
- placeholder: "Search authors", data: { any_user: "Any Author", first_user: (current_user.username if current_user), current_user: true, project_id: (@project.id if @project), selected: params[:author], field_name: "author_id", default_label: "Author" } })
+ placeholder: "Search authors", data: { any_user: "Any Author", first_user: (current_user.username if current_user), current_user: true, project_id: (@project.id if @project), selected: params[:author_id], field_name: "author_id", default_label: "Author" } })
.filter-item.inline
- if params[:assignee_id].present?