Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/scripts/trigger-build b/scripts/trigger-build
index cfaccaf4fe3..7fc550d86ee 100755
--- a/scripts/trigger-build
+++ b/scripts/trigger-build
@@ -274,6 +274,8 @@ module Trigger
     def create_remote_branch!
       Gitlab.create_branch(downstream_project_path, ref, 'master')
       puts "=> Remote branch '#{ref}' created"
+    rescue Gitlab::Error::BadRequest
+      puts "=> Remote branch '#{ref}' already exists!"
     end
 
     def cancel_latest_pipeline!
@@ -292,8 +294,6 @@ module Trigger
 
       # Cancel the pipeline
       Gitlab.cancel_pipeline(downstream_project_path, pipeline_id)
-    rescue Gitlab::Error::BadRequest
-      puts "=> Remote branch '#{ref}' already exists!"
     end
 
     def display_success_message