Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-17 09:48:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to glitch-soc's option to hide followers count.
  Ported upstream changes.

Additional changes:
- `app/views/application/mailer/_account.html.haml`:
  Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
  Ported the `frontend_asset_url` helper change to glitch-soc.
This commit is contained in:
Claire
2024-01-17 18:21:44 +01:00
parent d56e9fb873 127503eb2c
commit c59fb65ddc
198 changed files with 1231 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/rest/v1/instance_serializer.rb
View File

@@ -33,7 +33,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
end
def thumbnail
instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url(:'@1x')) : full_pack_url('media/images/preview.png')
instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url(:'@1x')) : frontend_asset_url('images/preview.png')
end
def max_toot_chars