{"push_id":759031800,"size":2,"distinct_size":1,"ref":"refs/heads/release-2.5.x","head":"fce971db54e800e9dcdb31064868d6fbb27c6581","before":"ceabcf3702ca2167ce39bcd6f0c63ffc200f985f","commits":[{"sha":"de2f93998381f3d1ee65470148051b8c61cc91e8","author":{"email":"2314b2e3a4a1f7db165be2aafbf1efd78f28cc97@beanbaginc.com","name":"Christian Hammond"},"message":"Fix duplicate From headers in e-mails.\n\nA previous change to the mail header code resulted in the From header\nbeing included in e-mails twice, with different values. Gmail (and\nlikely other mail systems) check for this, and will error out if they\ndon't match.\n\nThis was happening because we changed the mail header code to no longer\npass any headers down to the EmailMessage constructor, opting instead to\ninject headers ourselves. This is fine, except we did this to the From\nheader as well, which is considered special. The constructor needs to\nknow about this one, and since we no longer provided it, it fell back to\na default address. Our From header then got added later on, resulting in\ntwo different headers added.\n\nThe solution is simple. We just make From special again, and pass its\nheader down to the constructor.\n\nI've also renamed a member variable to help guard against any potential\nfuture changes to Django's EmailMessage class.\n\nUnit tests were added and updated to test for this.\n\nTesting Done:\nUnit tests passed.\n\nViewed a copy of the sent e-mail in some manual testing. There was only\none From header, and it had the correct value. Previously, I could see\ntwo conflicting values.\n\nReviewed at https://reviews.reviewboard.org/r/7588/","distinct":false,"url":"https://api.github.com/repos/reviewboard/reviewboard/commits/de2f93998381f3d1ee65470148051b8c61cc91e8"},{"sha":"fce971db54e800e9dcdb31064868d6fbb27c6581","author":{"email":"2314b2e3a4a1f7db165be2aafbf1efd78f28cc97@beanbaginc.com","name":"Christian Hammond"},"message":"Merge branch 'release-2.0.x' into release-2.5.x","distinct":true,"url":"https://api.github.com/repos/reviewboard/reviewboard/commits/fce971db54e800e9dcdb31064868d6fbb27c6581"}]}