summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Ignore .bundle generated filesZachary Scott2014-12-261-0/+1
| * Add extconf from trunkZachary Scott2014-12-251-0/+3
| * Only use gc stress assert if availableZachary Scott2014-12-251-9/+11
| * Sync tests with trunkZachary Scott2014-12-252-15/+11
| * This file shouldn't be committedZachary Scott2014-12-253-281/+1
| * bundle exec rakeZachary Scott2014-12-253-3/+283
| * Build on 2.2.0 tooZachary Scott2014-12-251-0/+1
| * This value has changed somehowZachary Scott2014-12-251-1/+1
| * Sync with trunkZachary Scott2014-12-2515-112/+197
| * Merge pull request #221 from iainbeeston/allow_ruby_head_to_failFlorian Frank2014-11-051-0/+1
| |\
| | * Added ruby-head to travis allowed-failuresIain Beeston2014-11-041-0/+1
| |/
| * Merge pull request #217 from jasonrclark/dont_mutate_dump_default_optionsFlorian Frank2014-09-262-1/+7
| |\
| | * Don't mutate JSON.dump_default_options from dumpJason R. Clark2014-09-192-1/+7
| |/
| * - Pass over generator.c for grammar fixes.Vipul A M2014-07-033-5/+4
| * Fix documentation wordingFlorian Frank2014-07-031-1/+1
| * Test on Ruby 2.1.x as wellFlorian Frank2014-07-031-1/+1
| * Merge pull request #212 from vipulnsward/pass-typoFlorian Frank2014-07-034-13/+13
| |\
| | * - Pass over generator.c for grammar fixes.Vipul A M2014-07-034-13/+13
| |/
| * No binstubsFlorian Frank2014-07-031-1/+1
| * Newest ruby 2.1.xFlorian Frank2014-07-031-1/+1
| * ReindentedFlorian Frank2014-07-031-7/+6
| * Document `Rational` json generation methods.Vipul A M2014-07-031-4/+10
| * Merge pull request #211 from vipulnsward/complex-docFlorian Frank2014-07-031-1/+7
| |\
| | * Document `Complex` json generation methods.Vipul A M2014-07-031-1/+7
| * | Merge pull request #209 from vipulnsward/method-definedFlorian Frank2014-07-031-1/+1
| |\ \ | | |/ | |/|
| | * Use method_defined? to check if method exists instead of slower check on inst...Vipul A M2014-07-031-1/+1
| |/
| * Merge pull request #202 from danielgrippi/patch-1Florian Frank2014-04-021-1/+1
| |\
| | * Update json-java.gemspecDaniel Grippi2014-04-021-1/+1
| |/
| * Change documentation to reflect new default valueFlorian Frank2014-04-012-3/+3
| * Merge pull request #194 from salimane/pr_ruby_2_1_0Florian Frank2014-01-031-0/+1
| |\
| | * Add Ruby 2.1.0 to .travis.ymlSalimane Adjao Moustapha2014-01-031-0/+1
| |/
View Lorry Controller Status