Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

4 files changed, 10 insertions, 6 deletions

diff --git a/lib/api/ci/pipeline_schedules.rb b/lib/api/ci/pipeline_schedules.rb
index 1afdb0ad34c..18caf85f109 100644
--- a/lib/api/ci/pipeline_schedules.rb
+++ b/lib/api/ci/pipeline_schedules.rb
@@ -2,7 +2,7 @@
 
 module API
   module Ci
-    class PipelineSchedules < Grape::API::Instance
+    class PipelineSchedules < ::API::Base
       include PaginationParams
 
       before { authenticate! }
diff --git a/lib/api/ci/pipelines.rb b/lib/api/ci/pipelines.rb
index 045f81074a7..61e03ed1a95 100644
--- a/lib/api/ci/pipelines.rb
+++ b/lib/api/ci/pipelines.rb
@@ -2,7 +2,7 @@
 
 module API
   module Ci
-    class Pipelines < Grape::API::Instance
+    class Pipelines < ::API::Base
       include PaginationParams
 
       before { authenticate_non_get! }
@@ -128,7 +128,7 @@ module API
 
           pipeline = user_project.all_pipelines.find(params[:pipeline_id])
 
-          if Feature.enabled?(:ci_jobs_finder_refactor)
+          if Feature.enabled?(:ci_jobs_finder_refactor, default_enabled: true)
             builds = ::Ci::JobsFinder
               .new(current_user: current_user, pipeline: pipeline, params: params)
               .execute
@@ -157,7 +157,7 @@ module API
 
           pipeline = user_project.all_pipelines.find(params[:pipeline_id])
 
-          if Feature.enabled?(:ci_jobs_finder_refactor)
+          if Feature.enabled?(:ci_jobs_finder_refactor, default_enabled: true)
             bridges = ::Ci::JobsFinder
               .new(current_user: current_user, pipeline: pipeline, params: params, type: ::Ci::Bridge)
               .execute
diff --git a/lib/api/ci/runner.rb b/lib/api/ci/runner.rb
index 08903dce3dc..ef679147c9f 100644
--- a/lib/api/ci/runner.rb
+++ b/lib/api/ci/runner.rb
@@ -2,7 +2,7 @@
 
 module API
   module Ci
-    class Runner < Grape::API::Instance
+    class Runner < ::API::Base
       helpers ::API::Helpers::Runner
 
       resource :runners do
@@ -72,6 +72,7 @@ module API
         post '/verify' do
           authenticate_runner!
           status 200
+          body "200"
         end
       end
 
@@ -181,7 +182,9 @@ module API
             .new(job, declared_params(include_missing: false))
 
           service.execute.then do |result|
+            header 'X-GitLab-Trace-Update-Interval', result.backoff
             status result.status
+            body result.status.to_s
           end
         end
 
@@ -292,6 +295,7 @@ module API
 
           if result[:status] == :success
             status :created
+            body "201"
           else
             render_api_error!(result[:message], result[:http_status])
           end
diff --git a/lib/api/ci/runners.rb b/lib/api/ci/runners.rb
index 7bca72f8028..d37f10fe631 100644
--- a/lib/api/ci/runners.rb
+++ b/lib/api/ci/runners.rb
@@ -2,7 +2,7 @@
 
 module API
   module Ci
-    class Runners < Grape::API::Instance
+    class Runners < ::API::Base
       include PaginationParams
 
       before { authenticate! }