Adds support for JSON 2 #169
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
iMacTia
force-pushed
the
support-json-2
branch
from
7a6c160 to
b0a4137
Compare
olleolleolle
approved these changes
Aug 28, 2017
spec/helper.rb
Outdated
| @@ -59,4 +59,8 @@ def process(body, content_type = nil, options = {}) | |||
| config.expect_with :rspec do |c| | |||
| c.syntax = :expect | |||
| end | |||
|
|
|||
| def jruby? | |||
| defined?(RUBY_ENGINE) and 'jruby' == RUBY_ENGINE | |||
There was a problem hiding this comment.
Style note: prefer && over and unless you're using the special precedence of and.
iMacTia
force-pushed
the
support-json-2
branch
from
6491027 to
492ba1f
Compare
|
Thanks for the review @olleolleolle |
Fixes incompatibility with jruby by isolating brotli Fixes #168
iMacTia
force-pushed
the
support-json-2
branch
from
492ba1f to
6603d57
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.
Fixes incompatibility with jruby by isolating brotli
Fixes #168