221580a3af
Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.
19 lines
738 B
Text
19 lines
738 B
Text
- content_for :header_tags do
|
|
- if user_signed_in?
|
|
= preload_pack_asset 'features/getting_started.js', crossorigin: 'anonymous'
|
|
= preload_pack_asset 'features/compose.js', crossorigin: 'anonymous'
|
|
= preload_pack_asset 'features/home_timeline.js', crossorigin: 'anonymous'
|
|
= preload_pack_asset 'features/notifications.js', crossorigin: 'anonymous'
|
|
|
|
= render partial: 'shared/og'
|
|
|
|
%meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
|
|
|
|
= render_initial_state
|
|
|
|
.notranslate.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')
|