3 Commits

Author	SHA1	Message	Date
Loïc Guitaut	3eaac56797	DEV: Use proper wording for contexts in specs	2022-08-04 11:05:02 +02:00
Phil Pirozhkov	493d437e79	Add RSpec 4 compatibility (#17652) ... * Remove outdated option 04078317ba * Use the non-globally exposed RSpec syntax https://github.com/rspec/rspec-core/pull/2803 * Use the non-globally exposed RSpec syntax, cont https://github.com/rspec/rspec-core/pull/2803 * Comply to strict predicate matchers See: - https://github.com/rspec/rspec-expectations/pull/1195 - https://github.com/rspec/rspec-expectations/pull/1196 - https://github.com/rspec/rspec-expectations/pull/1277	2022-07-28 10:27:38 +08:00
Martin Brennan	a6be4972a8	FIX: Use our header value instead of custom header on duplicates (#16711) ... When we build and send emails using MessageBuilder and Email::Sender we add custom headers defined in SiteSetting.email_custom_headers. However this was causing errors in cases where the custom headers defined a header that we already specify in outbound emails (e.g. the Precedence: list header for topic/post emails). This commit makes it so we always use the header value defined in Discourse core if there is a duplicate, discarding the custom header value from the site setting. cf. https://meta.discourse.org/t/email-notifications-fail-if-duplicate-headers-exist/222960/14	2022-05-11 13:47:12 +10:00