diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-15 20:41:54 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-15 20:41:54 +0000 |
| commit | a80b49ba1ac8ab54fd130ed889ecfbd0dccf81af (patch) | |
| tree | cf67f030ce49867b6c2491a55cfd6229b97a3291 | |
| parent | 495ae5135325096acdb4da0db2f482464c0093c3 (diff) | |
| parent | aff7c92596df8a277bd59411fb77425c91a403ba (diff) | |
| download | gitlab-ce-a80b49ba1ac8ab54fd130ed889ecfbd0dccf81af.tar.gz | |
Merge branch 'issue_14301' into 'master'
Fixes label on "Assignee" dropdown
Fixes #14301
See merge request !3239
| -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 42a3c2c3f02..3eb0db276b2 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -16,7 +16,7 @@ - if params[:assignee_id] = hidden_field_tag(:assignee_id, params[:assignee_id]) = dropdown_tag("Assignee", options: { toggle_class: "js-user-search js-filter-submit js-assignee-search", title: "Filter by assignee", filter: true, dropdown_class: "dropdown-menu-user dropdown-menu-selectable dropdown-menu-assignee", - placeholder: "Search assignee", data: { any_user: "Any Author", first_user: (current_user.username if current_user), null_user: true, current_user: true, project_id: (@project.id if @project), selected: params[:assignee_id], field_name: "assignee_id" } }) + placeholder: "Search assignee", data: { any_user: "Any Assignee", first_user: (current_user.username if current_user), null_user: true, current_user: true, project_id: (@project.id if @project), selected: params[:assignee_id], field_name: "assignee_id" } }) .filter-item.inline.milestone-filter - if params[:milestone_title] |