Remove trigger request and migrate all data to pipeline, by adding trigger_id and trigger_variables.remove-trigger-requests

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb
index 1d3767c78ff..311ba248d1a 100644
--- a/lib/api/triggers.rb
+++ b/lib/api/triggers.rb
@@ -32,9 +32,10 @@ module API
         end
 
         # create request and trigger builds
-        trigger_request = Ci::CreateTriggerRequestService.new.execute(project, trigger, params[:ref].to_s, variables)
-        if trigger_request
-          present trigger_request.pipeline, with: Entities::Pipeline
+        pipeline = Ci::CreatePipelineService.new(project, nil, ref: params[:ref].to_s).
+          execute(ignore_skip_ci: true, trigger: trigger, trigger_variables: variables)
+        if pipeline
+          present pipeline, with: Entities::Pipeline
         else
           errors = 'No pipeline created'
           render_api_error!(errors, 400)
@@ -51,7 +52,7 @@ module API
         authenticate!
         authorize! :admin_build, user_project
 
-        triggers = user_project.triggers.includes(:trigger_requests)
+        triggers = user_project.triggers
 
         present paginate(triggers), with: Entities::Trigger
       end