diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /app/controllers/projects/pipelines_controller.rb | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'app/controllers/projects/pipelines_controller.rb')
-rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 01f7bb9e2cf..7d1a75ae449 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -140,21 +140,13 @@ class Projects::PipelinesController < Projects::ApplicationController end def builds - if Feature.enabled?(:pipeline_tabs_vue, project) - redirect_to pipeline_path(@pipeline, tab: 'builds') - else - render_show - end + render_show end def dag respond_to do |format| format.html do - if Feature.enabled?(:pipeline_tabs_vue, project) - redirect_to pipeline_path(@pipeline, tab: 'dag') - else - render_show - end + render_show end format.json do render json: Ci::DagPipelineSerializer @@ -165,9 +157,7 @@ class Projects::PipelinesController < Projects::ApplicationController end def failures - if Feature.enabled?(:pipeline_tabs_vue, project) - redirect_to pipeline_path(@pipeline, tab: 'failures') - elsif @pipeline.failed_builds.present? + if @pipeline.failed_builds.present? render_show else redirect_to pipeline_path(@pipeline) @@ -222,11 +212,7 @@ class Projects::PipelinesController < Projects::ApplicationController def test_report respond_to do |format| format.html do - if Feature.enabled?(:pipeline_tabs_vue, project) - redirect_to pipeline_path(@pipeline, tab: 'test_report') - else - render_show - end + render_show end format.json do render json: TestReportSerializer @@ -352,7 +338,6 @@ class Projects::PipelinesController < Projects::ApplicationController experiment(:runners_availability_section, namespace: project.root_ancestor) do |e| e.candidate {} - e.publish_to_database end end |