diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-18 18:10:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-18 18:10:19 +0300 |
| commit | 884d6a4ece823bcb85dc0fe7f0c28ff2c3126867 (patch) | |
| tree | eeaeec800aa21cd6b2080ba96d3602a323227647 /app/controllers | |
| parent | 3aab29eacb2d35d90d93ed005b6fc825955b4d23 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/jobs_controller.rb | 10 | ||||
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/app/controllers/admin/jobs_controller.rb b/app/controllers/admin/jobs_controller.rb index 978dfe29ccd..d0ade3e6024 100644 --- a/app/controllers/admin/jobs_controller.rb +++ b/app/controllers/admin/jobs_controller.rb @@ -10,15 +10,7 @@ class Admin::JobsController < Admin::ApplicationController push_frontend_feature_flag(:admin_jobs_filter_runner_type, type: :ops) end - def index - # We need all builds for tabs counters - @all_builds = Ci::JobsFinder.new(current_user: current_user).execute - - @scope = params[:scope] - @builds = Ci::JobsFinder.new(current_user: current_user, params: params).execute - @builds = @builds.eager_load_everything - @builds = @builds.page(params[:page]).per(BUILDS_PER_PAGE).without_count - end + def index; end def cancel_all Ci::Build.running_or_pending.each(&:cancel) diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 5a2bda27582..802ffd99e41 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -27,15 +27,7 @@ class Projects::JobsController < Projects::ApplicationController feature_category :continuous_integration urgency :low - def index - # We need all builds for tabs counters - @all_builds = Ci::JobsFinder.new(current_user: current_user, project: @project).execute - - @scope = params[:scope] - @builds = Ci::JobsFinder.new(current_user: current_user, project: @project, params: params).execute - @builds = @builds.eager_load_everything - @builds = @builds.page(params[:page]).per(30).without_count - end + def index; end def show if @build.instance_of?(::Ci::Bridge) |