summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-01-21 00:50:14 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-01-21 00:50:14 +0000
commit3975ee57e34d355e86adf4977feff4fd5ab5d130 (patch)
treef4b973d2b145894afab8f2808f33f7710d127f9d /app
parent2f72d590026798e36c007069f540dbde098239c4 (diff)
parent3f17f29a22356d9305f981ae2eaac6b30bcfb8d0 (diff)
downloadgitlab-ce-3975ee57e34d355e86adf4977feff4fd5ab5d130.tar.gz
Merge branch 'filter-assigned-to-me' into 'master'
Added current user filter to assignee dropdown Closes #26959 and #26882 See merge request !8653
Diffstat (limited to 'app')
-rw-r--r--app/views/shared/issuable/_search_bar.html.haml4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml
index 8d7b1d616f4..964ad924014 100644
--- a/app/views/shared/issuable/_search_bar.html.haml
+++ b/app/views/shared/issuable/_search_bar.html.haml
@@ -47,6 +47,10 @@
%li.filter-dropdown-item{ 'data-value' => 'none' }
%button.btn.btn-link
No Assignee
+ - if current_user
+ %li.filter-dropdown-item{ 'data-value' => current_user.to_reference }
+ %button.btn.btn-link
+ Assigned to me
%li.divider
%ul.filter-dropdown{ 'data-dynamic' => true, 'data-dropdown' => true }
%li.filter-dropdown-item