diff options
Diffstat (limited to 'app/controllers/projects/jobs_controller.rb')
-rw-r--r-- | app/controllers/projects/jobs_controller.rb | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 4e0b304a2ee..802ffd99e41 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -8,8 +8,8 @@ class Projects::JobsController < Projects::ApplicationController urgency :low, [:index, :show, :trace, :retry, :play, :cancel, :unschedule, :erase, :raw] - before_action :find_job_as_build, except: [:index, :play, :retry] - before_action :find_job_as_processable, only: [:play, :retry] + before_action :find_job_as_build, except: [:index, :play, :retry, :show] + before_action :find_job_as_processable, only: [:play, :retry, :show] before_action :authorize_read_build_trace!, only: [:trace, :raw] before_action :authorize_read_build! before_action :authorize_update_build!, @@ -27,17 +27,13 @@ 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) + redirect_to project_pipeline_path(@build.downstream_pipeline.project, @build.downstream_pipeline.id) + end + respond_to do |format| format.html format.json do @@ -74,6 +70,8 @@ class Projects::JobsController < Projects::ApplicationController end def retry + Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/424184') + response = Ci::RetryJobService.new(project, current_user).execute(@build) if response.success? |