Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Fix typo in comment | Ignacio Galindo | 2015-01-02 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Fall back to Data_* wrappers on ancient rubies | Florian Frank | 2015-01-02 | 5 | -1/+19 | |
| | | | | ||||||
* | | | | Fix typo | Florian Frank | 2015-01-02 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'ruby-2.2' of https://github.com/zzak/json into zzak-ruby-2.2 | Florian Frank | 2015-01-02 | 17 | -59/+125 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml json.gemspec json_pure.gemspec | |||||
| * | | | Ignore generated files | Zachary Scott | 2014-12-27 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | RUBY_TYPED_FREE_IMMEDIATELY isn't always available | Zachary Scott | 2014-12-27 | 3 | -33/+39 | |
| | | | | ||||||
| * | | | Use ALLOC and MEMZERO instead of ZALLOC | Zachary Scott | 2014-12-26 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Revert part of "Sync with trunk" | Zachary Scott | 2014-12-26 | 3 | -49/+0 | |
| | | | | | | | | | | | | | | | | This partially reverts commit 18b3000. | |||||
| * | | | Ignore .bundle generated files | Zachary Scott | 2014-12-26 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Add extconf from trunk | Zachary Scott | 2014-12-25 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | Only use gc stress assert if available | Zachary Scott | 2014-12-25 | 1 | -9/+11 | |
| | | | | ||||||
| * | | | Sync tests with trunk | Zachary Scott | 2014-12-25 | 2 | -15/+11 | |
| | | | | ||||||
| * | | | This file shouldn't be committed | Zachary Scott | 2014-12-25 | 3 | -281/+1 | |
| | | | | ||||||
| * | | | bundle exec rake | Zachary Scott | 2014-12-25 | 3 | -3/+283 | |
| | | | | | | | | | | | | | | | | generates new specs and makefile for compiling the CEXT | |||||
| * | | | Build on 2.2.0 too | Zachary Scott | 2014-12-25 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | This value has changed somehow | Zachary Scott | 2014-12-25 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Sync with trunk | Zachary Scott | 2014-12-25 | 15 | -112/+197 | |
| |/ / | ||||||
| * | | Merge pull request #221 from iainbeeston/allow_ruby_head_to_fail | Florian Frank | 2014-11-05 | 1 | -0/+1 | |
| |\ \ | | | | | | | | | Allow ruby-head builds to fail | |||||
| | * | | Added ruby-head to travis allowed-failures | Iain Beeston | 2014-11-04 | 1 | -0/+1 | |
| |/ / | | | | | | | | | | | | | | | | | | | This is probably a contraversial idea. ruby-head can be fairly unstable but then json is a core gem. At least if it's an allowed-failure then builds will always be run against ruby-head, but pull requests (and master) won't report build failures if something is broken in ruby-head | |||||
| * | | Merge pull request #217 from jasonrclark/dont_mutate_dump_default_options | Florian Frank | 2014-09-26 | 2 | -1/+7 | |
| |\ \ | | | | | | | | | Don't mutate JSON.dump_default_options from dump | |||||
| | * | | Don't mutate JSON.dump_default_options from dump | Jason R. Clark | 2014-09-19 | 2 | -1/+7 | |
| |/ / | | | | | | | | | | | | | | | | | | | The use of Hash#update from the JSON.dump method was mutating the dump_default_options hash on any call to dump with a limit provided. An individual method call with an overriding value shouldn't update the defaults in this way. | |||||
| * | | - Pass over generator.c for grammar fixes. | Vipul A M | 2014-07-03 | 3 | -5/+4 | |
| | | | | | | | | | | | | - Typo fixes across json ext | |||||
| * | | Fix documentation wording | Florian Frank | 2014-07-03 | 1 | -1/+1 | |
| | | | ||||||
| * | | Test on Ruby 2.1.x as well | Florian Frank | 2014-07-03 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #212 from vipulnsward/pass-typo | Florian Frank | 2014-07-03 | 4 | -13/+13 | |
| |\ \ | | | | | | | | | Grammar/ Typo fixes | |||||
| | * | | - Pass over generator.c for grammar fixes. | Vipul A M | 2014-07-03 | 4 | -13/+13 | |
| |/ / | | | | | | | | | | - Typo fixes across json ext | |||||
| * | | No binstubs | Florian Frank | 2014-07-03 | 1 | -1/+1 | |
| | | | ||||||
| * | | Newest ruby 2.1.x | Florian Frank | 2014-07-03 | 1 | -1/+1 | |
| | | | ||||||
| * | | Reindented | Florian Frank | 2014-07-03 | 1 | -7/+6 | |
| | | | ||||||
| * | | Document `Rational` json generation methods. | Vipul A M | 2014-07-03 | 1 | -4/+10 | |
| | | | ||||||
| * | | Merge pull request #211 from vipulnsward/complex-doc | Florian Frank | 2014-07-03 | 1 | -1/+7 | |
| |\ \ | | | | | | | | | Document `Complex` json generation methods. | |||||
| | * | | Document `Complex` json generation methods. | Vipul A M | 2014-07-03 | 1 | -1/+7 | |
| | | | | ||||||
| * | | | Merge pull request #209 from vipulnsward/method-defined | Florian Frank | 2014-07-03 | 1 | -1/+1 | |
| |\ \ \ | | |/ / | |/| | | Use method_defined? to check if method exists instead of slower check | |||||
| | * | | Use method_defined? to check if method exists instead of slower check on ↵ | Vipul A M | 2014-07-03 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | instance_methods | |||||
| * | | Merge pull request #202 from danielgrippi/patch-1 | Florian Frank | 2014-04-02 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | Update json-java.gemspec | |||||
| | * | | Update json-java.gemspec | Daniel Grippi | 2014-04-02 | 1 | -1/+1 | |
| |/ / | | | | | | | Pluralize "license" to match other gemspecs. | |||||
| * | | Change documentation to reflect new default value | Florian Frank | 2014-04-01 | 2 | -3/+3 | |
| | | | ||||||
| * | | Merge pull request #194 from salimane/pr_ruby_2_1_0 | Florian Frank | 2014-01-03 | 1 | -0/+1 | |
| |\ \ | | |/ | |/| | Add Ruby 2.1.0 to .travis.yml | |||||
| | * | Add Ruby 2.1.0 to .travis.yml | Salimane Adjao Moustapha | 2014-01-03 | 1 | -0/+1 | |
| |/ | ||||||
| * | Merge pull request #189 from joiggama/master | Florian Frank | 2013-11-04 | 1 | -1/+1 | |
| |\ | | | | | | | Fix typo in comment | |||||
| | * | Fix typo in comment | Ignacio Galindo | 2013-10-31 | 1 | -1/+1 | |
| |/ | ||||||
* | | - Pass over generator.c for grammar fixes. | Vipul A M | 2014-07-03 | 3 | -5/+4 | |
| | | | | | | | | - Typo fixes across json ext | |||||
* | | Fix documentation wording | Florian Frank | 2014-07-03 | 5 | -15/+15 | |
| | | ||||||
* | | Test on Ruby 2.1.x as well | Florian Frank | 2014-07-03 | 1 | -0/+1 | |
|/ | ||||||
* | Newest rubygemsv1.8.1 | Florian Frank | 2013-10-17 | 2 | -2/+2 | |
| | ||||||
* | New version 1.8.1 | Florian Frank | 2013-10-17 | 6 | -8/+13 | |
| | ||||||
* | Merge pull request #185 from brixen/master | Florian Frank | 2013-10-16 | 1 | -4/+1 | |
|\ | | | | | Removed unnecessary and incorrect condition for Rubinius. | |||||
| * | Removed unnecessary and incorrect condition for Rubinius. | Brian Shirai | 2013-09-21 | 1 | -4/+1 | |
|/ | ||||||
* | Add to the CHANGESv1.8.0 | Florian Frank | 2013-05-13 | 1 | -1/+8 | |
| | ||||||
* | Bump to version 1.8.0add-json-generic-object-loader-dumper | Florian Frank | 2013-05-13 | 4 | -6/+6 | |
| |