summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-05-28 14:41:53 +0900
committerShinya Maeda <shinya@gitlab.com>2018-05-28 14:41:53 +0900
commitfa61ea6e31816b711a2b5aab3989c550472fab3c (patch)
tree7fc86667841ba2ef1bcd49b4847158b53ff09075
parent92b2647d003cb1126cb4786956a2887189da803c (diff)
downloadgitlab-ce-add-moneky-patch-for-using-stream-upload-with-carrierwave.tar.gz
-rw-r--r--config/initializers/carrierwave_monkey_patch.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/config/initializers/carrierwave_monkey_patch.rb b/config/initializers/carrierwave_monkey_patch.rb
index 5b929bfb961..7543231cd4f 100644
--- a/config/initializers/carrierwave_monkey_patch.rb
+++ b/config/initializers/carrierwave_monkey_patch.rb
@@ -1,6 +1,5 @@
-# This is a monkey patch until https://github.com/carrierwaveuploader/carrierwave/pull/2314 has been merged
-# This fixes a problem https://gitlab.com/gitlab-org/gitlab-ce/issues/46182 that carrierwave loads large files into memory
-# and triggers sidekiq shutdown by hitting RSS limit.
+# This fixes the problem https://gitlab.com/gitlab-org/gitlab-ce/issues/46182 that carrierwave eagerly loads upoloading files into memory
+# There is an PR https://github.com/carrierwaveuploader/carrierwave/pull/2314 which has the identical change.
module CarrierWave
module Storage
class Fog < Abstract