diff options
| author | Jonathon Reinhart <Jonathon.Reinhart@gmail.com> | 2017-11-28 22:50:29 -0500 |
|---|---|---|
| committer | Jonathon Reinhart <Jonathon.Reinhart@gmail.com> | 2018-12-31 13:57:53 -0500 |
| commit | ba781484c7b1bea2829f3429990a7cf39bb37ff8 (patch) | |
| tree | 4f09b375a23a4f96deff70138c7870aa9ffa47d5 /lib/gitlab/data_builder | |
| parent | 4d875a2bc365d1c5eb9c0965f91e688efae1e143 (diff) | |
| download | gitlab-ce-ba781484c7b1bea2829f3429990a7cf39bb37ff8.tar.gz | |
Add support for Git push options, specifically ci.skip
gitlab-org/gitlab-shell!166 added support for collecting push options
from the environment, and passing them along to the
/internal/post_receive API endpoint.
This change handles the new push_options JSON element in the payload,
and passes them on through to the GitPushService and GitTagPushService
services.
Futhermore, it adds support for the first push option, ci.skip. With
this change, one can use 'git push -o ci.skip' to skip CI pipe
execution. Note that the pipeline is still created, but in the "skipped"
state, just like with the 'ci skip' commit message text.
Implements #18667
Diffstat (limited to 'lib/gitlab/data_builder')
| -rw-r--r-- | lib/gitlab/data_builder/push.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/gitlab/data_builder/push.rb b/lib/gitlab/data_builder/push.rb index 9bf2f9291a8..862127110b9 100644 --- a/lib/gitlab/data_builder/push.rb +++ b/lib/gitlab/data_builder/push.rb @@ -31,7 +31,11 @@ module Gitlab } } ], - total_commits_count: 1 + total_commits_count: 1, + push_options: [ + "ci.skip", + "custom option" + ] }.freeze # Produce a hash of post-receive data @@ -52,10 +56,12 @@ module Gitlab # homepage: String, # }, # commits: Array, - # total_commits_count: Fixnum + # total_commits_count: Fixnum, + # push_options: Array # } # - def build(project, user, oldrev, newrev, ref, commits = [], message = nil, commits_count: nil) + # rubocop:disable Metrics/ParameterLists + def build(project, user, oldrev, newrev, ref, commits = [], message = nil, commits_count: nil, push_options: []) commits = Array(commits) # Total commits count @@ -93,6 +99,7 @@ module Gitlab project: project.hook_attrs, commits: commit_attrs, total_commits_count: commits_count, + push_options: push_options, # DEPRECATED repository: project.hook_attrs.slice(:name, :url, :description, :homepage, :git_http_url, :git_ssh_url, :visibility_level) |