This repository has been archived by the owner on Jan 30, 2018. It is now read-only.
Merge of my fixes from master #34
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
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. |
This is probably a better general solution than checking if we're on Heroku Conflicts: lib/tasks/rcov.rake
…ve paths Some paths in the application are interpreted as relative to the present working directory. If the user does not first cd to the Rails root, this causes the application to bomb out at various places when running receive_mail.
Conflicts: Gemfile.lock
Rebuilding is only necessary when the schema changes, so doing this is a job for the deployment script Conflicts: config/schedule.rb
|
Rebased on top of recent commits and added a fix for output redirection in the receive_email script to prevent bounce messages |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.