diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-11-07 13:43:56 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-07 13:43:56 +0100 |
| commit | 83774367d25fd5ad3f9a7b103bea30c13c9e03d8 (patch) | |
| tree | 4358e66ceae8a3497ee62e3ec6b8a47b6fb26a8a /app/presenters | |
| parent | dd2ec970dbe39f09d3da32d6a8f524aaad68a9d6 (diff) | |
| parent | 514e427bd2877e53323791797f508d4ab5007396 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/account_relationships_presenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb index b05673a3d..08614b67c 100644 --- a/app/presenters/account_relationships_presenter.rb +++ b/app/presenters/account_relationships_presenter.rb @@ -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)) |