diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-16 17:10:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 17:10:27 +0100 |
| commit | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (patch) | |
| tree | 97325ab7ad5a572170637da7a72ba72b7231a02f /app/serializers/rss | |
| parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
| parent | 0fbe90e2d3cfc2c5d1fd12ea564daa52a83ec0ac (diff) | |
Merge pull request #961 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rss')
| -rw-r--r-- | app/serializers/rss/account_serializer.rb | 2 | ||||
| -rw-r--r-- | app/serializers/rss/tag_serializer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/rss/account_serializer.rb b/app/serializers/rss/account_serializer.rb index 712b1347a..88eca79ed 100644 --- a/app/serializers/rss/account_serializer.rb +++ b/app/serializers/rss/account_serializer.rb @@ -11,7 +11,7 @@ class RSS::AccountSerializer builder.title("#{display_name(account)} (@#{account.local_username_and_domain})") .description(account_description(account)) .link(TagManager.instance.url_for(account)) - .logo(full_asset_url(asset_pack_path('logo.svg'))) + .logo(full_pack_url('media/images/logo.svg')) .accent_color('2b90d9') builder.image(full_asset_url(account.avatar.url(:original))) if account.avatar? diff --git a/app/serializers/rss/tag_serializer.rb b/app/serializers/rss/tag_serializer.rb index 7680a8da5..644380149 100644 --- a/app/serializers/rss/tag_serializer.rb +++ b/app/serializers/rss/tag_serializer.rb @@ -12,7 +12,7 @@ class RSS::TagSerializer builder.title("##{tag.name}") .description(strip_tags(I18n.t('about.about_hashtag_html', hashtag: tag.name))) .link(tag_url(tag)) - .logo(full_asset_url(asset_pack_path('logo.svg'))) + .logo(full_pack_url('media/images/logo.svg')) .accent_color('2b90d9') statuses.each do |status| |