Follow up #34064 #34109
Merged
Follow up #34064 #34109
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
The removed code was added in 7f870a5, then 7f870a5 was reverted by rails#34064. But I found that that commit wasn't completely reverted, I guess it was caused by resolving some conflicts during reverting. @schneems could you please confirm that those changes weren't reverted unintentionally, or reject this commit otherwise?
bogdanvlviv
force-pushed
the
follow-up-34064
branch
from
f27b1b1
to
9c2a87a
Compare
|
If I missed something it was due to a merge conflict resolved incorrectly. My goal was to get “rails s” on master working again which my revert did. I don’t know that it’s 100% necessarry that all the code be removed. If we do merge this we need to let @tenderlove know so when he goes to work on this again he knows to revert both merge commits. I restarted the failing tests. |
schneems
approved these changes
Oct 7, 2018
|
@schneems Some more information I found:
|
This is true but it also broke GitHub's build that runs against master so I approved the revert (and we don't use devise). I think other apps would have broken as well. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The removed code was added in 7f870a5,
then 7f870a5 was reverted by #34064.
But I found that that commit wasn't completely reverted, I guess it was
caused by resolving some conflicts during reverting.
@schneems could you please confirm that those changes weren't reverted
unintentionally, or reject this commit otherwise?
r? @schneems