summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'parse_error_encoding' of https://github.com/nobu/json into be-c...be-compatible-with-ruby-2.2.1Florian Frank2015-05-154-136/+180
|\
| * parser.rl: rb_enc_raisenobu2015-04-184-93/+144
| * parser.rl: use rb_encodingnobu2015-04-182-124/+119
| * parser.rl: use StringValuenobu2015-04-182-23/+21
* | Merge branch 'backport-r49161' of https://github.com/hsbt/json into be-compat...Florian Frank2015-05-151-8/+0
|\ \
| * | backport ruby/ruby r49161: https://github.com/ruby/ruby/commit/c0ee6f2af98a83...SHIBATA Hiroshi2015-04-121-8/+0
| |/
* | backported ruby/ruby trunk r49562: https://github.com/ruby/ruby/commit/e5c516...SHIBATA Hiroshi2015-02-132-1/+11
|/
* use ZALLOC if it can be used, and defined ZALLOC macro.SHIBATA Hiroshi2015-02-125-39/+54
* sync trunk again: fixed regression of r49027SHIBATA Hiroshi2015-02-122-9/+9
* Merge branch 'master' of storage.gate.ping.de:/git/jsonv1.8.2Florian Frank2015-01-090-0/+0
|\
| * Bump version number to 1.8.2Florian Frank2015-01-084-5/+5
| * Merge branch 'master' of github.com:flori/jsonFlorian Frank2015-01-083-4/+19
| |\
| | * Merge pull request #225 from mmacvicar/fix-space-beforeFlorian Frank2015-01-032-0/+14
| | |\
| | | * Make generator format test backwards compatibleMichael Mac-Vicar2014-12-071-1/+1
| | | * Use space_before as documented in the generatorMichael Mac-Vicar2014-12-071-0/+1
| | | * Add test for format options used by the generatorMichael Mac-Vicar2014-12-071-0/+13
| | * | Merge pull request #226 from bbrowning/runtimeinfo-contention-fixFlorian Frank2015-01-022-89/+91
| | |\ \
| | | * | Improve JRuby perf. by removing source of multithreaded contentionBen Browning2014-12-162-89/+91
| | | |/
| | * | Merge pull request #228 from JuanitoFatas/patch/travis-new-build-envFlorian Frank2015-01-021-0/+3
| | |\ \
| | | * | Use the new build env on Travis.Juanito Fatas2014-12-191-0/+3
| | | |/
| | * | Merge pull request #230 from jc00ke/patch-1Florian Frank2015-01-021-4/+2
| | |\ \ | | | |/ | | |/|
| | | * CI with current rbx-2Jesse Cooke2014-12-251-4/+2
| | |/
* | | Bump version number to 1.8.2Florian Frank2015-01-094-5/+5
* | | Add to CHANGESFlorian Frank2015-01-091-0/+9
* | | Make generator format test backwards compatibleMichael Mac-Vicar2015-01-091-1/+1
* | | Use space_before as documented in the generatorMichael Mac-Vicar2015-01-091-0/+1
* | | Add test for format options used by the generatorMichael Mac-Vicar2015-01-091-0/+13
* | | Use the new build env on Travis.Juanito Fatas2015-01-091-0/+3
* | | CI with current rbx-2Jesse Cooke2015-01-091-4/+2
|/ /
* | Merge branch 'ruby220' of https://github.com/hsbt/json into zzak-ruby-2.2zzak-ruby-2.2Florian Frank2015-01-030-0/+0
|\ \
| * | fix to build fail with rb_str_new macro usageSHIBATA Hiroshi2014-12-281-1/+1
| |/
* | Merge branch 'master' into zzak-ruby-2.2Florian Frank2015-01-027-94/+113
|\ \
| * | Improve JRuby perf. by removing source of multithreaded contentionBen Browning2015-01-022-89/+91
| * | Added ruby-head to travis allowed-failuresIain Beeston2015-01-021-0/+1
| * | Don't mutate JSON.dump_default_options from dumpJason R. Clark2015-01-022-1/+7
| * | No binstubsFlorian Frank2015-01-021-1/+1
| * | ReindentedFlorian Frank2015-01-021-7/+6
| * | Document `Rational` json generation methods.Vipul A M2015-01-021-4/+10
| * | Document `Complex` json generation methods.Vipul A M2015-01-021-1/+7
| * | Use method_defined? to check if method exists instead of slower check on inst...Vipul A M2015-01-021-1/+1
| * | Update json-java.gemspecDaniel Grippi2015-01-021-1/+1
| * | Change documentation to reflect new default valueFlorian Frank2015-01-021-2/+2
| * | Fix typo in commentIgnacio Galindo2015-01-021-1/+1
* | | Fall back to Data_* wrappers on ancient rubiesFlorian Frank2015-01-025-1/+19
* | | Fix typoFlorian Frank2015-01-021-1/+1
* | | Merge branch 'ruby-2.2' of https://github.com/zzak/json into zzak-ruby-2.2Florian Frank2015-01-0217-59/+125
|\ \ \ | |/ / |/| |
| * | Ignore generated filesZachary Scott2014-12-271-0/+2
| * | RUBY_TYPED_FREE_IMMEDIATELY isn't always availableZachary Scott2014-12-273-33/+39
| * | Use ALLOC and MEMZERO instead of ZALLOCZachary Scott2014-12-261-1/+2
| * | Revert part of "Sync with trunk"Zachary Scott2014-12-263-49/+0