summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-05-25 17:27:18 +0900
committerShinya Maeda <shinya@gitlab.com>2018-05-28 14:34:37 +0900
commit39d804b151e5958be5ef140920cbee2f2cd1c78c (patch)
treeb635165551c95181f3870d704d85fb16e02a506f /config
parent50b68fc2ea8c0428142c96378422a3138dbf0fe1 (diff)
downloadgitlab-ce-39d804b151e5958be5ef140920cbee2f2cd1c78c.tar.gz
Reload remote file the cacheds file is already removed
Diffstat (limited to 'config')
-rw-r--r--config/initializers/carrierwave_monkey_patch.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/carrierwave_monkey_patch.rb b/config/initializers/carrierwave_monkey_patch.rb
index dd2c656b171..bfd0f1c3d36 100644
--- a/config/initializers/carrierwave_monkey_patch.rb
+++ b/config/initializers/carrierwave_monkey_patch.rb
@@ -15,6 +15,9 @@ module CarrierWave
begin
file_body = ::File.open(file_body.path) if file_body.closed? # Reopen if it's closed
file_body.read
+ rescue Errno::ENOENT
+ @file = nil # rubocop:disable Gitlab/ModuleWithInstanceVariables
+ file.body
ensure
file_body.close
end