tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2018-04-03 19:17:20 +00:00
parent 1f5bdd8445 d8d4217959
commit 6611100480
70 changed files with 924 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/activitypub/process_account_service.rb
View File

@@ -28,7 +28,7 @@ class ActivityPub::ProcessAccountService < BaseService
after_protocol_change! if protocol_changed?
after_key_change! if key_changed?
check_featured_collection! if @account.featured_collection_url.present?
check_featured_collection! if @account&.featured_collection_url&.present?
@account
rescue Oj::ParseError