diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-17 09:32:22 +0100 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-30 18:21:53 -0500 |
| commit | 1be406d741a3096f831fbb85b09a24749d8bcfcb (patch) | |
| tree | e505894e565595968e6b53806b948f45f48f53b8 | |
| parent | 586ac6460b54dcb280d52948013ae55dac7aad88 (diff) | |
| download | gitlab-ce-1be406d741a3096f831fbb85b09a24749d8bcfcb.tar.gz | |
Swap Author and Assignee Selectors on issuable index view
Closes #4039
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 712563e5f06..fc8ae9f8eb7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,8 @@ v 8.4.0 (unreleased) - Add CAS support (tduehr) - Add link to merge request on build detail page - Revert back upvote and downvote button to the issue and MR pages + - Enable "Add key" button when user fills in a proper key (Stan Hu) + - Swap position of Assignee and Author selector on Issueables (Zeger-Jan van de Weg) v 8.3.3 (unreleased) - Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu) diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index ac6c248ccf1..be06738eac9 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -30,13 +30,13 @@ class: "check_all_issues left" .issues-other-filters .filter-item.inline - = users_select_tag(:assignee_id, selected: params[:assignee_id], - placeholder: 'Assignee', class: 'trigger-submit', any_user: "Any Assignee", null_user: true, first_user: true, current_user: true) - - .filter-item.inline = users_select_tag(:author_id, selected: params[:author_id], placeholder: 'Author', class: 'trigger-submit', any_user: "Any Author", first_user: true, current_user: true) + .filter-item.inline + = users_select_tag(:assignee_id, selected: params[:assignee_id], + placeholder: 'Assignee', class: 'trigger-submit', any_user: "Any Assignee", null_user: true, first_user: true, current_user: true) + .filter-item.inline.milestone-filter = select_tag('milestone_title', projects_milestones_options, class: 'select2 trigger-submit', include_blank: true, |