From fa61ea6e31816b711a2b5aab3989c550472fab3c Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Mon, 28 May 2018 14:41:53 +0900 Subject: Revise comments --- config/initializers/carrierwave_monkey_patch.rb | 5 ++--- 1 file 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 -- cgit v1.2.1