Fix ActionController patching conflict #391
Merged
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
delner
force-pushed
the
bugfix/action_controller_patcher_conflict
branch
from
9006641
to
2de02f1
Compare
…atch #process_action
delner
force-pushed
the
bugfix/action_controller_patcher_conflict
branch
from
2de02f1
to
2b37cf1
Compare
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.
Some gems patch ActionController by overriding
process_action, which creates a conflict that can result in either gem not working properly.The problem can manifest as traces that are missing ActionController traces:
This pull request adds a
prependpatching strategy for applications that use Ruby 2.0+, which prevents this from happening. Applications that use Ruby < 1.9.3 that also have a gem that conflicts with ours, will not be fixed by this change.