Merge of my fixes from master
Hi, I've worked through merging my fixes from master to the dev branch. These commits should be exactly equivalent to the ones from master, with the exclusion of the fix for rspec-on-rails-matchers, as that plugin has been removed from dev and so the patch no longer applies.
Added a commit to fix Upload.inherit_privacy, which didn't handle the situation where an upload's comment_id and associated comment exists but is marked as deleted, in which case the association would not load. This would cause the GenerateUploadTokensIfMissing migration to break. Apologies for not including a test case.
Hi guys, just wondered if you had a chance to look at this pull request (and the equivalent on master)? It fixes several breakage issues with Whenever/cron jobs, receiving e-mail, rake, and a migration.
Rebased on top of recent commits and added a fix for output redirection in the receive_email script to prevent bounce messages