luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix Paperclip timeout setting. Fix bug introduced in #437

Browse source
This commit is contained in:
Eugen Rochko 2017-01-08 19:12:54 +01:00
parent 38bc85e695
commit 2e71bb031b
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/account.rb
View file

@ -190,8 +190,10 @@ class Account < ApplicationRecord
follow_mapping(FollowRequest.where(target_account_id: target_account_ids, account_id: account_id), :target_account_id)
end
private def follow_mapping(query, field)
query.pluck(field).inject({}) { |mapping, id| mapping[id] = true }
private
def follow_mapping(query, field)
query.pluck(field).inject({}) { |mapping, id| mapping[id] = true; mapping }
end
end

2
config/initializers/paperclip.rb
View file

@ -1,6 +1,6 @@
# frozen_string_literal: true
Paperclip::Attachment.default_options[:read_timeout] = 60
Paperclip.options[:read_timeout] = 60
if ENV['S3_ENABLED'] == 'true'
Aws.eager_autoload!(services: %w(S3))