Merge tag 'v3.0.0' into hometown-dev

2019-10-08 13:24:20 -07:00
parent bfd29a34eb 83d3e7733d
commit 228e0f0f6e
1012 changed files with 31176 additions and 15165 deletions
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@ -5,8 +5,7 @@
  = preload_link_tag asset_pack_path('features/notifications.js'), crossorigin: 'anonymous'

  %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
-  %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
-
+  = render_initial_state
  = javascript_pack_tag 'application', integrity: true, crossorigin: 'anonymous'

 .app-holder#mastodon{ data: { props: Oj.dump(default_props) } }