Force UTF8 encoding on generated XML (#1140)
This commit is contained in:
		
							
								
								
									
										2
									
								
								Procfile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Procfile
									
									
									
									
									
								
							@@ -1,2 +1,2 @@
 | 
			
		||||
web: bundle exec puma -C config/puma.rb
 | 
			
		||||
worker: bundle exec sidekiq -q default -q mailers -q push
 | 
			
		||||
worker: bundle exec sidekiq -q default -q push -q pull -q mailers
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@ class AtomSerializer
 | 
			
		||||
    def render(element)
 | 
			
		||||
      document = Ox::Document.new(version: '1.0')
 | 
			
		||||
      document << element
 | 
			
		||||
      "<?xml version=\"1.0\"?>#{Ox.dump(element)}"
 | 
			
		||||
      ('<?xml version="1.0"?>' + Ox.dump(element)).force_encoding('UTF-8')
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -11,8 +11,10 @@
 | 
			
		||||
    %meta{:name => "theme-color", :content => "#282c37"}/
 | 
			
		||||
    %meta{:name => "apple-mobile-web-app-capable", :content => "yes"}/
 | 
			
		||||
 | 
			
		||||
    %title
 | 
			
		||||
      = "#{yield(:page_title)} - " if content_for?(:page_title)
 | 
			
		||||
    %title<
 | 
			
		||||
      - if content_for?(:page_title)
 | 
			
		||||
        = yield(:page_title)
 | 
			
		||||
        = ' - '
 | 
			
		||||
      = Setting.site_title
 | 
			
		||||
 | 
			
		||||
    = stylesheet_link_tag 'application', media: 'all'
 | 
			
		||||
 
 | 
			
		||||
@@ -9,7 +9,7 @@ preload_app!
 | 
			
		||||
 | 
			
		||||
on_worker_boot do
 | 
			
		||||
  if ENV['HEROKU'] # Spawn the workers from Puma, to only use one dyno
 | 
			
		||||
    @sidekiq_pid ||= spawn('bundle exec sidekiq -q default -q mailers -q push')
 | 
			
		||||
    @sidekiq_pid ||= spawn('bundle exec sidekiq -q default -q push -q pull -q mailers ')
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user