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

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's
This commit is contained in:
Thibaut Girka
2019-11-07 13:43:56 +01:00
parent dd2ec970db 514e427bd2
commit 83774367d2
13 changed files with 485 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/presenters/account_relationships_presenter.rb
View File

@ -6,7 +6,7 @@ class AccountRelationshipsPresenter
:endorsed
def initialize(account_ids, current_account_id, **options)
@account_ids = account_ids.map { |a| a.is_a?(Account) ? a.id : a }
@account_ids = account_ids.map { |a| a.is_a?(Account) ? a.id : a.to_i }
@current_account_id = current_account_id
@following = cached[:following].merge(Account.following_map(@uncached_account_ids, @current_account_id))