Project

General

Profile

Defect #14699 ยป merge_headers.diff

Vincent Robert, 2014-11-24 10:46

View differences:

app/models/mailer.rb
370 370
  end
371 371

  
372 372
  def mail(headers={}, &block)
373
    headers.merge! 'X-Mailer' => 'Redmine',
373
    headers.reverse_merge! 'X-Mailer' => 'Redmine',
374 374
            'X-Redmine-Host' => Setting.host_name,
375 375
            'X-Redmine-Site' => Setting.app_title,
376 376
            'X-Auto-Response-Suppress' => 'OOF',
    (1-1/1)