diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-14 03:09:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-14 03:09:30 +0300 |
| commit | 8957ace3159e5369a700a77614493ed6a8a98f93 (patch) | |
| tree | 98ff5be0caa30cfebb4e0cd0ae2ceaf21ce92eb4 /app/controllers/admin | |
| parent | 232e0a31f1e5d5b3a788dfc3dba8f8d41df36bf9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/jobs_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/jobs_controller.rb b/app/controllers/admin/jobs_controller.rb index 892f6dc657c..a3a18a115e9 100644 --- a/app/controllers/admin/jobs_controller.rb +++ b/app/controllers/admin/jobs_controller.rb @@ -3,10 +3,10 @@ class Admin::JobsController < Admin::ApplicationController def index # We need all builds for tabs counters - @all_builds = JobsFinder.new(current_user: current_user).execute + @all_builds = Ci::JobsFinder.new(current_user: current_user).execute @scope = params[:scope] - @builds = JobsFinder.new(current_user: current_user, params: params).execute + @builds = Ci::JobsFinder.new(current_user: current_user, params: params).execute @builds = @builds.eager_load_everything @builds = @builds.page(params[:page]).per(30) end |