mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
4df3b7cb06
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.
16 lines
783 B
Plaintext
16 lines
783 B
Plaintext
- content_for :header_tags do
|
|
= preload_link_tag asset_pack_path('features/getting_started.js'), crossorigin: 'anonymous'
|
|
= preload_link_tag asset_pack_path('features/compose.js'), crossorigin: 'anonymous'
|
|
= preload_link_tag asset_pack_path('features/home_timeline.js'), crossorigin: 'anonymous'
|
|
= 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)
|
|
|
|
.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
|
|
%noscript
|
|
= image_pack_tag 'logo.svg', alt: 'Mastodon'
|
|
|
|
%div
|
|
= t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')
|