Conflicts: - `app/views/layouts/application.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change. - `app/views/layouts/embedded.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change.
		
			
				
	
	
		
			17 lines
		
	
	
	
		
			604 B
		
	
	
	
		
			Text
		
	
	
	
	
	
			
		
		
	
	
			17 lines
		
	
	
	
		
			604 B
		
	
	
	
		
			Text
		
	
	
	
	
	
| - content_for :header_tags do
 | |
|   - if user_signed_in?
 | |
|     = preload_pack_asset 'features/compose.js'
 | |
|     = preload_pack_asset 'features/home_timeline.js'
 | |
|     = preload_pack_asset 'features/notifications.js'
 | |
|     %meta{ name: 'initialPath', content: request.path }
 | |
| 
 | |
|   %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')
 |