Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 18 deletions

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 01f7bb9e2cf..dd3e9886239 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