Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

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

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