Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
		
			
				
	
	
		
			24 lines
		
	
	
		
			846 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			24 lines
		
	
	
		
			846 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
!!! 5
 | 
						|
%html{ lang: I18n.locale }
 | 
						|
  %head
 | 
						|
    %meta{ charset: 'utf-8' }/
 | 
						|
    %meta{ name: 'robots', content: 'noindex' }/
 | 
						|
 | 
						|
    - if cdn_host?
 | 
						|
      %link{ rel: 'dns-prefetch', href: cdn_host }/
 | 
						|
 | 
						|
    - if storage_host?
 | 
						|
      %link{ rel: 'dns-prefetch', href: storage_host }/
 | 
						|
 | 
						|
    = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
 | 
						|
    - if @theme
 | 
						|
      - if @theme[:supported_locales].include? I18n.locale.to_s
 | 
						|
        = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
 | 
						|
      - elsif @theme[:supported_locales].include? 'en'
 | 
						|
        = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous'
 | 
						|
    = render partial: 'layouts/theme', object: @core
 | 
						|
    = render partial: 'layouts/theme', object: @theme
 | 
						|
 | 
						|
  %body.embed
 | 
						|
    = yield
 |