diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-14 08:35:16 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-14 08:35:16 +0000 |
| commit | b6658333701fae1bcf80a37004eebd47f53dddaa (patch) | |
| tree | 4f1a5c3a2daee852ce0f7a83a644c8bd4af1f71b | |
| parent | f6f58cfb1fd7bc7fcef5e9b1f2ce658a15047b1d (diff) | |
| parent | e58e75aa8860c4c1530ebe7ad1e4bf557fa1e848 (diff) | |
| download | gitlab-ce-b6658333701fae1bcf80a37004eebd47f53dddaa.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/admin/users/index.html.haml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1b4f77ce849..cd699995f20 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index b0d31170704..5e40d95d1c5 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -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 |