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

Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline

Browse Source
This commit is contained in:
David Yip
2017-10-25 16:01:20 -05:00
parent 5f0268ab84 a76b024228
commit 42f2045c21
21 changed files with 341 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/home/index.html.haml
View File

@ -5,6 +5,7 @@
%link{ href: asset_pack_path('features/notifications.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
%link{ href: asset_pack_path('features/community_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
%link{ href: asset_pack_path('features/public_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
%link{ href: asset_pack_path('features/direct_timeline.js'), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
%meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
%script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)