diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-09-06 11:30:15 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-09-06 11:30:15 +0000 |
| commit | abc2caaa2894ee4bc9902228efc30a022044e7d1 (patch) | |
| tree | 1998a120a01f2d12c264d6385623498d225a4817 /lib | |
| parent | 228d819b5761de1e2362952a9d0f08828c88424d (diff) | |
| parent | 262b974123d22b5d6b662b232ca4792d7998a166 (diff) | |
| download | gitlab-ce-abc2caaa2894ee4bc9902228efc30a022044e7d1.tar.gz | |
Merge branch 'sh-fix-attachments-inline' into 'master'
Fix attachments not displaying inline with Google Cloud Storage
Closes #49957
See merge request gitlab-org/gitlab-ce!21265
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/object_storage/direct_upload.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/object_storage/direct_upload.rb b/lib/object_storage/direct_upload.rb index b372b4af090..ab43910c8bd 100644 --- a/lib/object_storage/direct_upload.rb +++ b/lib/object_storage/direct_upload.rb @@ -158,7 +158,7 @@ module ObjectStorage end def upload_options - { 'Content-Type' => 'application/octet-stream' } + {} end def connection |