diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-09-11 11:19:02 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-09-11 11:19:02 +0300 |
| commit | bfaa96d586668678893e295062495f2c35b73c2a (patch) | |
| tree | 9b598b46a8e802ccc162f08b310c4ef1261442e2 /app/controllers | |
| parent | b88728e7b13fb193bc3a359e18f23b371bc93d16 (diff) | |
| parent | 08c3e59aeed34ad71e74afb674ddda7327fdc3a7 (diff) | |
Merge branch 'sh-fix-oauth-application-page' into 'master'
Optimize /admin/applications so that it does not timeout
Closes #67228
See merge request gitlab-org/gitlab-ce!32852
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/applications_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb index 3648c8be426..22e629ccf59 100644 --- a/app/controllers/admin/applications_controller.rb +++ b/app/controllers/admin/applications_controller.rb @@ -7,7 +7,9 @@ class Admin::ApplicationsController < Admin::ApplicationController before_action :load_scopes, only: [:new, :create, :edit, :update] def index - @applications = ApplicationsFinder.new.execute + applications = ApplicationsFinder.new.execute + @applications = Kaminari.paginate_array(applications).page(params[:page]) + @application_counts = OauthAccessToken.distinct_resource_owner_counts(@applications) end def show |