summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-13 08:42:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-13 08:42:17 +0000
commit5f971ac8cc03e6b6434bb671a2eb5666447c631c (patch)
tree885478a252069e9e782ecc4b443cbd28531a85b9
parent011f0e841ce905e4e9c02d5aaa0762196c6821d7 (diff)
downloadgitlab-ce-5f971ac8cc03e6b6434bb671a2eb5666447c631c.tar.gz
Add latest changes from gitlab-org/security/gitlab@12-7-stable-ee
-rw-r--r--spec/support/helpers/workhorse_helpers.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/helpers/workhorse_helpers.rb b/spec/support/helpers/workhorse_helpers.rb
index 0de8b382403..de232da3c8c 100644
--- a/spec/support/helpers/workhorse_helpers.rb
+++ b/spec/support/helpers/workhorse_helpers.rb
@@ -32,12 +32,12 @@ module WorkhorseHelpers
# workhorse_finalize will transform file_key inside params as if it was the finalize call of an inline object storage upload.
# note that based on the content of the params it can simulate a disc acceleration or an object storage upload
- def workhorse_finalize(url, method: :post, file_key:, params:, headers: {})
+ def workhorse_finalize(url, method: :post, file_key:, params:, headers: {}, send_rewritten_field: false)
workhorse_request_with_file(method, url,
file_key: file_key,
params: params,
extra_headers: headers,
- send_rewritten_field: false
+ send_rewritten_field: send_rewritten_field
)
end