Add latest changes from gitlab-org/gitlab@master

1 files changed, 23 insertions, 7 deletions

diff --git a/app/services/git/base_hooks_service.rb b/app/services/git/base_hooks_service.rb
index 269637805ad..968d45bbcdb 100644
--- a/app/services/git/base_hooks_service.rb
+++ b/app/services/git/base_hooks_service.rb
@@ -53,11 +53,11 @@ module Git
     def create_pipelines
       return unless params.fetch(:create_pipelines, true)
 
-      Ci::CreatePipelineService
-        .new(project, current_user, pipeline_params)
-        .execute!(:push, pipeline_options)
-    rescue Ci::CreatePipelineService::CreateError => ex
-      log_pipeline_errors(ex)
+      if ::Feature.enabled?(:refactored_create_pipeline_execution_method, project)
+        create_pipeline_refactored
+      else
+        create_pipeline_legacy
+      end
     end
 
     def execute_project_hooks
@@ -148,14 +148,14 @@ module Git
       {}
     end
 
-    def log_pipeline_errors(exception)
+    def log_pipeline_errors(error_message)
       data = {
         class: self.class.name,
         correlation_id: Labkit::Correlation::CorrelationId.current_id.to_s,
         project_id: project.id,
         project_path: project.full_path,
         message: "Error creating pipeline",
-        errors: exception.to_s,
+        errors: error_message,
         pipeline_params: sanitized_pipeline_params
       }
 
@@ -175,5 +175,21 @@ module Git
         Gitlab::IntegrationsLogger
       end
     end
+
+    def create_pipeline_refactored
+      response = Ci::CreatePipelineService
+          .new(project, current_user, pipeline_params)
+          .execute(:push, **pipeline_options)
+
+      log_pipeline_errors(response.message) unless response.payload.persisted?
+    end
+
+    def create_pipeline_legacy
+      Ci::CreatePipelineService
+      .new(project, current_user, pipeline_params)
+      .execute!(:push, pipeline_options)
+    rescue Ci::CreatePipelineService::CreateError => ex
+      log_pipeline_errors(ex.to_s) # Stringifying the ex here as I removed stringifying in log_pipeline_errors.
+    end
   end
 end