diff options
Diffstat (limited to 'app/controllers/projects/jobs_controller.rb')
-rw-r--r-- | app/controllers/projects/jobs_controller.rb | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 9574c5d5849..ad59f421c06 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -5,28 +5,22 @@ class Projects::JobsController < Projects::ApplicationController include ContinueParams include ProjectStatsRefreshConflictsGuard - urgency :low, [:index, :show, :trace, :retry, :play, :cancel, :unschedule, :status, :erase, :raw] + urgency :low, [:index, :show, :trace, :retry, :play, :cancel, :unschedule, :erase, :raw] before_action :find_job_as_build, except: [:index, :play, :show] before_action :find_job_as_processable, only: [:play, :show] before_action :authorize_read_build_trace!, only: [:trace, :raw] before_action :authorize_read_build! before_action :authorize_update_build!, - except: [:index, :show, :status, :raw, :trace, :erase, :cancel, :unschedule] + except: [:index, :show, :raw, :trace, :erase, :cancel, :unschedule] before_action :authorize_erase_build!, only: [:erase] before_action :authorize_use_build_terminal!, only: [:terminal, :terminal_websocket_authorize] before_action :verify_api_request!, only: :terminal_websocket_authorize before_action :authorize_create_proxy_build!, only: :proxy_websocket_authorize before_action :verify_proxy_request!, only: :proxy_websocket_authorize - before_action :push_jobs_table_vue, only: [:index] - before_action :push_jobs_table_vue_search, only: [:index] + before_action :push_job_log_search, only: [:show] before_action :reject_if_build_artifacts_size_refreshing!, only: [:erase] - before_action do - push_frontend_feature_flag(:infinitely_collapsible_sections, @project) - push_frontend_feature_flag(:trigger_job_retry_action, @project) - end - layout 'project' feature_category :continuous_integration @@ -125,12 +119,6 @@ class Projects::JobsController < Projects::ApplicationController end end - def status - render json: Ci::JobSerializer - .new(project: @project, current_user: @current_user) - .represent_status(@build.present(current_user: current_user)) - end - def erase if @build.erase(erased_by: current_user) redirect_to project_job_path(project, @build), @@ -261,11 +249,7 @@ class Projects::JobsController < Projects::ApplicationController ::Gitlab::Workhorse.channel_websocket(service) end - def push_jobs_table_vue - push_frontend_feature_flag(:jobs_table_vue, @project) - end - - def push_jobs_table_vue_search - push_frontend_feature_flag(:jobs_table_vue_search, @project) + def push_job_log_search + push_frontend_feature_flag(:job_log_search, @project) end end |