Merge branch '18667-handle-push-opts' into 'master'

Handle 'git push -o ci.skip'

Closes #18667

See merge request gitlab-org/gitlab-ce!15643

3 files changed, 6 insertions, 3 deletions

diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index 19b5552887f..f8d8ef04001 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -31,7 +31,8 @@ module Ci
         seeds_block: block,
         variables_attributes: params[:variables_attributes],
         project: project,
-        current_user: current_user)
+        current_user: current_user,
+        push_options: params[:push_options])
 
       sequence = Gitlab::Ci::Pipeline::Chain::Sequence
         .new(pipeline, command, SEQUENCE)
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index f1883877d56..9ecee7c6156 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -174,7 +174,8 @@ class GitPushService < BaseService
       params[:newrev],
       params[:ref],
       @push_commits,
-      commits_count: commits_count)
+      commits_count: commits_count,
+      push_options: params[:push_options] || [])
   end
 
   def push_to_existing_branch?
diff --git a/app/services/git_tag_push_service.rb b/app/services/git_tag_push_service.rb
index dbadafc0f52..03fcf614c64 100644
--- a/app/services/git_tag_push_service.rb
+++ b/app/services/git_tag_push_service.rb
@@ -45,7 +45,8 @@ class GitTagPushService < BaseService
       params[:newrev],
       params[:ref],
       commits,
-      message)
+      message,
+      push_options: params[:push_options] || [])
   end
 
   def build_system_push_data