1 files changed, 16 insertions, 18 deletions

diff --git a/lib/api/ci/pipelines.rb b/lib/api/ci/pipelines.rb
index 33bb8b38d92..a010e0dd761 100644
--- a/lib/api/ci/pipelines.rb
+++ b/lib/api/ci/pipelines.rb
@@ -13,7 +13,7 @@ module API
       resource :projects, requirements: ::API::API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
         desc 'Get all Pipelines of the project' do
           detail 'This feature was introduced in GitLab 8.11.'
-          success Entities::PipelineBasic
+          success Entities::Ci::PipelineBasic
         end
         params do
           use :pagination
@@ -38,12 +38,12 @@ module API
           authorize! :read_build, user_project
 
           pipelines = ::Ci::PipelinesFinder.new(user_project, current_user, params).execute
-          present paginate(pipelines), with: Entities::PipelineBasic
+          present paginate(pipelines), with: Entities::Ci::PipelineBasic
         end
 
         desc 'Create a new pipeline' do
           detail 'This feature was introduced in GitLab 8.14'
-          success Entities::Pipeline
+          success Entities::Ci::Pipeline
         end
         params do
           requires :ref, type: String, desc: 'Reference'
@@ -64,7 +64,7 @@ module API
                              .execute(:api, ignore_skip_ci: true, save_on_errors: false)
 
           if new_pipeline.persisted?
-            present new_pipeline, with: Entities::Pipeline
+            present new_pipeline, with: Entities::Ci::Pipeline
           else
             render_validation_error!(new_pipeline)
           end
@@ -72,7 +72,7 @@ module API
 
         desc 'Gets a the latest pipeline for the project branch' do
           detail 'This feature was introduced in GitLab 12.3'
-          success Entities::Pipeline
+          success Entities::Ci::Pipeline
         end
         params do
           optional :ref, type: String, desc: 'branch ref of pipeline'
@@ -80,12 +80,12 @@ module API
         get ':id/pipelines/latest' do
           authorize! :read_pipeline, latest_pipeline
 
-          present latest_pipeline, with: Entities::Pipeline
+          present latest_pipeline, with: Entities::Ci::Pipeline
         end
 
         desc 'Gets a specific pipeline for the project' do
           detail 'This feature was introduced in GitLab 8.11'
-          success Entities::Pipeline
+          success Entities::Ci::Pipeline
         end
         params do
           requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
@@ -93,12 +93,12 @@ module API
         get ':id/pipelines/:pipeline_id' do
           authorize! :read_pipeline, pipeline
 
-          present pipeline, with: Entities::Pipeline
+          present pipeline, with: Entities::Ci::Pipeline
         end
 
         desc 'Gets the variables for a given pipeline' do
           detail 'This feature was introduced in GitLab 11.11'
-          success Entities::Variable
+          success Entities::Ci::Variable
         end
         params do
           requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
@@ -106,19 +106,17 @@ module API
         get ':id/pipelines/:pipeline_id/variables' do
           authorize! :read_pipeline_variable, pipeline
 
-          present pipeline.variables, with: Entities::Variable
+          present pipeline.variables, with: Entities::Ci::Variable
         end
 
         desc 'Gets the test report for a given pipeline' do
-          detail 'This feature was introduced in GitLab 13.0. Disabled by default behind feature flag `junit_pipeline_view`'
+          detail 'This feature was introduced in GitLab 13.0.'
           success TestReportEntity
         end
         params do
           requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
         end
         get ':id/pipelines/:pipeline_id/test_report' do
-          not_found! unless Feature.enabled?(:junit_pipeline_view, user_project)
-
           authorize! :read_build, pipeline
 
           present pipeline.test_reports, with: TestReportEntity, details: true
@@ -141,7 +139,7 @@ module API
 
         desc 'Retry builds in the pipeline' do
           detail 'This feature was introduced in GitLab 8.11.'
-          success Entities::Pipeline
+          success Entities::Ci::Pipeline
         end
         params do
           requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
@@ -151,12 +149,12 @@ module API
 
           pipeline.retry_failed(current_user)
 
-          present pipeline, with: Entities::Pipeline
+          present pipeline, with: Entities::Ci::Pipeline
         end
 
         desc 'Cancel all builds in the pipeline' do
           detail 'This feature was introduced in GitLab 8.11.'
-          success Entities::Pipeline
+          success Entities::Ci::Pipeline
         end
         params do
           requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
@@ -167,14 +165,14 @@ module API
           pipeline.cancel_running
 
           status 200
-          present pipeline.reset, with: Entities::Pipeline
+          present pipeline.reset, with: Entities::Ci::Pipeline
         end
       end
 
       helpers do
         def pipeline
           strong_memoize(:pipeline) do
-            user_project.ci_pipelines.find(params[:pipeline_id])
+            user_project.all_pipelines.find(params[:pipeline_id])
           end
         end