diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
| commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
| tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /qa/qa/resource/repository | |
| parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
| download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'qa/qa/resource/repository')
| -rw-r--r-- | qa/qa/resource/repository/push.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qa/qa/resource/repository/push.rb b/qa/qa/resource/repository/push.rb index 1e5399fcc59..5266f8b9bea 100644 --- a/qa/qa/resource/repository/push.rb +++ b/qa/qa/resource/repository/push.rb @@ -11,7 +11,7 @@ module QA :branch_name, :new_branch, :output, :repository_http_uri, :repository_ssh_uri, :ssh_key, :user, :use_lfs, :tag_name - attr_writer :remote_branch, :gpg_key_id + attr_writer :remote_branch, :gpg_key_id, :merge_request_push_options def initialize @file_name = "file-#{SecureRandom.hex(8)}.txt" @@ -24,6 +24,7 @@ module QA @use_lfs = false @tag_name = nil @gpg_key_id = nil + @merge_request_push_options = nil end def remote_branch @@ -95,7 +96,7 @@ module QA end @output += commit_to repository - @output += repository.push_changes("#{branch_name}:#{remote_branch}") + @output += repository.push_changes("#{branch_name}:#{remote_branch}", push_options: @merge_request_push_options) end repository.delete_ssh_key |