Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-02-05 18:28:09 +0300
committerSean McGivern <sean@mcgivern.me.uk>2018-02-05 18:28:09 +0300
commit0e15a5b805e832c22c67cead8c4829e6c77cd498 (patch)
treeb089759f9810c6439198e134615196b4d8078559 /lib
parent2fe09e6a12e4f533d77517ddd7fe40fc53522f92 (diff)
parentce84d1835332932e25ebdc2cfbe44ff301328a1f (diff)
Merge branch '42547-upload-store-mount-point' into 'master'
Store uploader context in uploads Closes #42547 See merge request gitlab-org/gitlab-ce!16779
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/gfm/uploads_rewriter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gfm/uploads_rewriter.rb b/lib/gitlab/gfm/uploads_rewriter.rb
index 3fdc3c27f73..1b74f735679 100644
--- a/lib/gitlab/gfm/uploads_rewriter.rb
+++ b/lib/gitlab/gfm/uploads_rewriter.rb
@@ -46,7 +46,7 @@ module Gitlab
private
def find_file(project, secret, file)
- uploader = FileUploader.new(project, secret)
+ uploader = FileUploader.new(project, secret: secret)
uploader.retrieve_from_store!(file)
uploader.file
end