Merge: new branch 104525314 from more recent master, merge changes

This commit is contained in:
Matt Farnsworth 2015-10-26 19:09:33 +02:00
commit db3e849c8a
9 changed files with 167 additions and 18 deletions

View file

@ -1,5 +1,9 @@
PDFKit.configure do |config|
config.wkhtmltopdf = "#{Rails.root}/vendor/bin/wkhtmltopdf"
installed = %x(which wkhtmltopdf).chomp
if installed == "" then
installed = "#{Rails.root}/vendor/bin/wkhtmltopdf"
end
config.wkhtmltopdf = installed
config.default_options = {
page_size: 'A4',
quiet: true