diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-02-25 11:20:41 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-02-25 11:20:41 +0000 |
| commit | e5c7027faffb75f1d2f7221fa11609741010d82f (patch) | |
| tree | d5270f59a827010355b45344c6a79114f8b95a36 /app/controllers/admin | |
| parent | c39e094bc863180e351d36207b98b1680c4c8e5d (diff) | |
| parent | e87c255d9e76fb3ca691267107e83d48c90bc816 (diff) | |
| download | gitlab-ce-e5c7027faffb75f1d2f7221fa11609741010d82f.tar.gz | |
Merge branch 'sh-fix-users-controller-ruby-2.6-compat' into 'master'
Make Admin::UsersController work with Ruby 2.6
See merge request gitlab-org/gitlab-ce!25316
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 0eae007715a..bfa7c7d0109 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -7,7 +7,7 @@ class Admin::UsersController < Admin::ApplicationController before_action :check_impersonation_availability, only: :impersonate def index - @users = User.order_name_asc.filter(params[:filter]) + @users = User.filter_items(params[:filter]).order_name_asc @users = @users.search_with_secondary_emails(params[:search_query]) if params[:search_query].present? @users = @users.sort_by_attribute(@sort = params[:sort]) @users = @users.page(params[:page]) |