Fix trigger_request.variables

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/api/v3/triggers.rb b/lib/api/v3/triggers.rb
index 497ccbe20c6..13cfb9fe38b 100644
--- a/lib/api/v3/triggers.rb
+++ b/lib/api/v3/triggers.rb
@@ -32,15 +32,13 @@ module API
             render_api_error!(result[:message], result[:http_status])
           else
             pipeline = result[:pipeline]
-            trigger_request = pipeline.trigger_request
+            trigger_request = Ci::TriggerRequest.find_by(commit_id: pipeline.id)
 
             # We switched to Ci::PipelineVariable from Ci::TriggerRequest.variables.
             # Ci::TriggerRequest doesn't save variables anymore.
             # Here is copying Ci::PipelineVariable to Ci::TriggerRequest.variables for presenting the variables.
             # The same endpoint in v4 API pressents Pipeline instead of TriggerRequest, so it doesn't need such a process.
-            pipeline.variables.each do |variable|
-              trigger_request.variables << { key: variable.key, value: variable.value }
-            end
+            trigger_request.variables = params[:variables]
 
             present trigger_request, with: ::API::V3::Entities::TriggerRequest
           end