Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.
This commit is contained in:
@@ -85,7 +85,7 @@ class SuspendAccountService < BaseService
|
||||
rescue Aws::S3::Errors::NotImplemented => e
|
||||
Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}"
|
||||
end
|
||||
when :fog
|
||||
when :fog, :azure
|
||||
# Not supported
|
||||
when :filesystem
|
||||
begin
|
||||
|
@@ -81,7 +81,7 @@ class UnsuspendAccountService < BaseService
|
||||
rescue Aws::S3::Errors::NotImplemented => e
|
||||
Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}"
|
||||
end
|
||||
when :fog
|
||||
when :fog, :azure
|
||||
# Not supported
|
||||
when :filesystem
|
||||
begin
|
||||
|
Reference in New Issue
Block a user