diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-18 15:08:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-18 15:08:09 +0300 |
| commit | 823d2f9a2c8796e5061c59595f96a1132641b26a (patch) | |
| tree | 219b13820bd398acc48f3cc719c7a7bfdf77aa26 /app/views/shared/issuable/_search_bar.html.haml | |
| parent | 627bd5db4e091d0be312c880cbb9139b7c86818b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared/issuable/_search_bar.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index 8db7f7345f4..33975ebbb42 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -93,6 +93,8 @@ avatar: { lazy: true, url: '{{avatar_url}}' } = render_if_exists 'shared/issuable/approver_dropdown' = render_if_exists 'shared/issuable/approved_by_dropdown' + - if ::Feature.enabled?(:mr_merge_user_filter, type: :development) + = render_if_exists 'shared/issuable/merge_user_dropdown' #js-dropdown-milestone.filtered-search-input-dropdown-menu.dropdown-menu %ul{ data: { dropdown: true } } %li.filter-dropdown-item{ data: { value: 'None' } } |