Commit b6658333 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'respect_filters' into 'master'

Fix: User search feature in admin area does not respect filters

https://dev.gitlab.org/gitlab/gitlabhq/issues/2482

See merge request !1155
parents f6f58cfb e58e75aa
......@@ -54,6 +54,7 @@ v 7.14.0 (unreleased)
- Add dropzone upload progress
- Add a label for merged branches on branches page (Florent Baldino)
- Detect .mkd and .mkdn files as markdown (Ben Boeckel)
- Fix: User search feature in admin area does not respect filters
v 7.13.5
- Satellites reverted
......
......@@ -33,6 +33,7 @@
= form_tag admin_users_path, method: :get, class: 'form-inline' do
.form-group
= search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control'
= hidden_field_tag "filter", params[:filter]
= button_tag class: 'btn btn-primary' do
%i.fa.fa-search
%hr
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment