diff options
author | John Jarvis <jarv@gitlab.com> | 2019-04-11 16:58:43 +0300 |
---|---|---|
committer | John Jarvis <jarv@gitlab.com> | 2019-04-11 16:58:43 +0300 |
commit | e6ed2ebc1ec98950d78c0187ca9497d8ee49d88f (patch) | |
tree | bb5955dca3ac09b15d25911508a01a6560898e86 /lib/gitlab/data_builder/push.rb | |
parent | 76228a95a6fb86e622857e689245d63fd2c3f599 (diff) | |
parent | e015401ac27ba7a91a384cb0331dc709632f00b5 (diff) |
Merge branch '11-10-stable-prepare-rc6' into '11-10-stable'
Prepare 11.10.0-rc6 release
See merge request gitlab-org/gitlab-ce!27232
Diffstat (limited to 'lib/gitlab/data_builder/push.rb')
-rw-r--r-- | lib/gitlab/data_builder/push.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/gitlab/data_builder/push.rb b/lib/gitlab/data_builder/push.rb index ea08b5f7eae..af385d7d4ca 100644 --- a/lib/gitlab/data_builder/push.rb +++ b/lib/gitlab/data_builder/push.rb @@ -32,10 +32,7 @@ module Gitlab } ], total_commits_count: 1, - push_options: [ - "ci.skip", - "custom option" - ] + push_options: { ci: { skip: true } } }.freeze # Produce a hash of post-receive data @@ -57,11 +54,11 @@ module Gitlab # }, # commits: Array, # total_commits_count: Fixnum, - # push_options: Array + # push_options: Hash # } # # rubocop:disable Metrics/ParameterLists - def build(project, user, oldrev, newrev, ref, commits = [], message = nil, commits_count: nil, push_options: []) + def build(project, user, oldrev, newrev, ref, commits = [], message = nil, commits_count: nil, push_options: {}) commits = Array(commits) # Total commits count |