diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-24 14:47:48 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-24 15:02:59 +0200 |
| commit | ddd875ad9940c4c7ef53a31af23cd5fe89fcf0c9 (patch) | |
| tree | 7926abdec378339ee622a1f09b9a52178f4d0600 /app/services/activitypub | |
| parent | 38d28824475056766c97385b66f4e04a5123e3a2 (diff) | |
| parent | 66ac1bd063882f5a2f828c1c702089e37f36f217 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder
Diffstat (limited to 'app/services/activitypub')
| -rw-r--r-- | app/services/activitypub/process_account_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index ad22d37fe..05c017bdf 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -205,7 +205,7 @@ class ActivityPub::ProcessAccountService < BaseService def domain_block return @domain_block if defined?(@domain_block) - @domain_block = DomainBlock.find_by(domain: @domain) + @domain_block = DomainBlock.rule_for(@domain) end def key_changed? |