diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-28 19:24:51 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-28 19:24:51 +0300 |
| commit | bb88fb7ea234fc28824c8e5490194271478c4cc6 (patch) | |
| tree | d6e79d74f1523eb1e16142ad68c6253b1c9edf37 /app | |
| parent | 57838e331c75aeab08a89d23c22f54a074477519 (diff) | |
| parent | acdea516c1d14ef17256858507b7a4316f01350f (diff) | |
Merge branch 'patch-28' into 'master'
Returns a correct TMP_UPLOAD_PATH to workhourse
Closes #46763
See merge request gitlab-org/gitlab-ce!19148
Diffstat (limited to 'app')
| -rw-r--r-- | app/uploaders/object_storage.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb index f2a8afccdeb..3fd27d9acdc 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -11,7 +11,7 @@ module ObjectStorage ObjectStorageUnavailable = Class.new(StandardError) DIRECT_UPLOAD_TIMEOUT = 4.hours - TMP_UPLOAD_PATH = 'tmp/upload'.freeze + TMP_UPLOAD_PATH = 'tmp/uploads'.freeze module Store LOCAL = 1 |