nrd.li/mastodon
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'feature-ox-fix' into skylight

Browse source
This commit is contained in:
Eugen Rochko 2017-04-07 11:09:29 +02:00
parent ed4d2d8a69 6164662e1f
commit 011bcbf21f
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Procfile
View file

@ -1,2 +1,2 @@
web: bundle exec puma -C config/puma.rb 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

2
app/lib/atom_serializer.rb
View file

@ -7,7 +7,7 @@ class AtomSerializer
def render(element) def render(element)
document = Ox::Document.new(version: '1.0') document = Ox::Document.new(version: '1.0')
document << element document << element
"<?xml version=\"1.0\"?>#{Ox.dump(element)}" ('<?xml version="1.0"?>' + Ox.dump(element)).force_encoding('UTF-8')
end end
end end

6
app/views/layouts/application.html.haml
View file

@ -11,8 +11,10 @@
%meta{:name => "theme-color", :content => "#282c37"}/ %meta{:name => "theme-color", :content => "#282c37"}/
%meta{:name => "apple-mobile-web-app-capable", :content => "yes"}/ %meta{:name => "apple-mobile-web-app-capable", :content => "yes"}/
%title %title<
= "#{yield(:page_title)} - " if content_for?(:page_title) - if content_for?(:page_title)
= yield(:page_title)
= ' - '
= Setting.site_title = Setting.site_title
= stylesheet_link_tag 'application', media: 'all' = stylesheet_link_tag 'application', media: 'all'

2
config/puma.rb
View file

@ -9,7 +9,7 @@ preload_app!
on_worker_boot do on_worker_boot do
if ENV['HEROKU'] # Spawn the workers from Puma, to only use one dyno 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 end
ActiveRecord::Base.establish_connection if defined?(ActiveRecord) ActiveRecord::Base.establish_connection if defined?(ActiveRecord)