Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 1 deletions

diff --git a/app/services/ci/create_cross_project_pipeline_service.rb b/app/services/ci/create_cross_project_pipeline_service.rb
index 99f232bc892..3a2cc3f9d32 100644
--- a/app/services/ci/create_cross_project_pipeline_service.rb
+++ b/app/services/ci/create_cross_project_pipeline_service.rb
@@ -52,6 +52,11 @@ module Ci
           subject.drop!(:downstream_pipeline_creation_failed)
         end
       end
+    rescue StateMachines::InvalidTransition => e
+      Gitlab::ErrorTracking.track_exception(
+        Ci::Bridge::InvalidTransitionError.new(e.message),
+        bridge_id: bridge.id,
+        downstream_pipeline_id: pipeline.id)
     end
 
     def ensure_preconditions!(target_ref)
diff --git a/app/services/ci/pipeline_bridge_status_service.rb b/app/services/ci/pipeline_bridge_status_service.rb
index 19ed5026a3a..e2e5dd386f2 100644
--- a/app/services/ci/pipeline_bridge_status_service.rb
+++ b/app/services/ci/pipeline_bridge_status_service.rb
@@ -5,7 +5,14 @@ module Ci
     def execute(pipeline)
       return unless pipeline.bridge_triggered?
 
-      pipeline.source_bridge.inherit_status_from_downstream!(pipeline)
+      begin
+        pipeline.source_bridge.inherit_status_from_downstream!(pipeline)
+      rescue StateMachines::InvalidTransition => e
+        Gitlab::ErrorTracking.track_exception(
+          Ci::Bridge::InvalidTransitionError.new(e.message),
+          bridge_id: pipeline.source_bridge.id,
+          downstream_pipeline_id: pipeline.id)
+      end
     end
   end
 end