Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #442 from BurdetteLamar/rdoc | Hiroshi SHIBATA | 2020-07-31 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Nodoc for recurse_proc | BurdetteLamar | 2020-07-29 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #439 from BurdetteLamar/master | Hiroshi SHIBATA | 2020-07-29 | 1 | -18/+58 | |
|\ \ \ | ||||||
| * | | | RDoc for JSON.load with proc | BurdetteLamar | 2020-07-28 | 1 | -18/+58 | |
* | | | | Merge pull request #436 from kares/green-ci | Hiroshi SHIBATA | 2020-07-08 | 2 | -4/+1 | |
|\ \ \ \ | ||||||
| * | | | | [test] properly 'skip' test on JRuby | Karol Bucek | 2020-07-07 | 2 | -4/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #435 from kares/jruby-sync | Hiroshi SHIBATA | 2020-07-06 | 3 | -49/+32 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | [refactor] drop old JRuby 1.7 compat code | Karol Bucek | 2020-07-06 | 1 | -24/+5 | |
| * | | | unify json-java gemspec with the baseline | Karol Bucek | 2020-07-06 | 2 | -25/+27 | |
|/ / / | ||||||
* | | | Merge pull request #434 from BurdetteLamar/master | Hiroshi SHIBATA | 2020-07-05 | 2 | -14/+88 | |
|\ \ \ | ||||||
| * | | | RDoc example for JSON.load | BurdetteLamar | 2020-07-04 | 2 | -14/+88 | |
|/ / / | ||||||
* | | | Merge pull request #385 from nobu/bug/non-utf8 | Hiroshi SHIBATA | 2020-07-04 | 0 | -0/+0 | |
|\ \ \ | ||||||
| * | | | Fixed unexpected illegal/malformed utf-8 error | Nobuyoshi Nakada | 2019-10-14 | 2 | -1/+16 | |
* | | | | Merge pull request #372 from kares/jruby-ci | Hiroshi SHIBATA | 2020-07-04 | 1 | -4/+4 | |
|\ \ \ \ | ||||||
| * | | | | [CI] setup supported JRubies to test against | kares | 2020-06-25 | 1 | -4/+4 | |
* | | | | | Merge pull request #433 from BurdetteLamar/master | Hiroshi SHIBATA | 2020-07-04 | 1 | -9/+40 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Enhance RDoc for JSON.parse | BurdetteLamar | 2020-07-03 | 1 | -9/+40 | |
* | | | | | Merge pull request #432 from mame/prevent-warning-during-test | Hiroshi SHIBATA | 2020-07-03 | 1 | -0/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | test/json/json_fixtures_test.rb: Prevent an "out of range" warning | Yusuke Endoh | 2020-07-03 | 1 | -0/+3 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #431 from mame/avoid-relative-path-in-load-path | Hiroshi SHIBATA | 2020-07-03 | 1 | -3/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Do not add a relative path to $LOAD_PATH | Yusuke Endoh | 2020-07-03 | 1 | -3/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #430 from BurdetteLamar/master | Hiroshi SHIBATA | 2020-07-02 | 2 | -177/+181 | |
|\ \ \ \ | ||||||
| * | | | | Move options from #generate and #parse to common area | BurdetteLamar | 2020-06-30 | 2 | -177/+181 | |
* | | | | | Bump version to 2.3.1v2.3.1 | Hiroshi SHIBATA | 2020-07-01 | 3 | -2/+24 | |
* | | | | | Merge pull request #387 from keithrbennett/add-load-file-methods | Hiroshi SHIBATA | 2020-07-01 | 2 | -0/+66 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add `load_file` and `load_file!` methods, with tests. Fixes issue #386. | Keith Bennett | 2020-06-30 | 2 | -0/+66 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #429 from flori/remove-generate-task-for-gemspec | Hiroshi SHIBATA | 2020-06-30 | 2 | -49/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Removed gemspec task from default task on Rakefileremove-generate-task-for-gemspec | Hiroshi SHIBATA | 2020-06-30 | 1 | -1/+1 | |
| * | | | | | Use VERSION file instead of hard-coded value | Hiroshi SHIBATA | 2020-06-30 | 1 | -1/+1 | |
| * | | | | | Removed explicitly date field in gemspec, it will assign by rubygems.org | Hiroshi SHIBATA | 2020-06-30 | 1 | -1/+0 | |
| * | | | | | Removed task for json_pure.gemspec | Hiroshi SHIBATA | 2020-06-30 | 2 | -46/+0 | |
* | | | | | | Merge pull request #426 from marcandre/indent | Hiroshi SHIBATA | 2020-06-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix alignment | Marc-Andre Lafortune | 2020-06-30 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #428 from marcandre/change_fix | Hiroshi SHIBATA | 2020-06-30 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make changes more precise [#424] | Marc-Andre Lafortune | 2020-06-30 | 1 | -1/+4 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #424 from marcandre/update_changes | Hiroshi SHIBATA | 2020-06-30 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Update Changes for 2.3.0 [Fixes #397] | Marc-Andre Lafortune | 2020-06-30 | 1 | -0/+8 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #423 from marcandre/typo | Hiroshi SHIBATA | 2020-06-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Typo fix | Marc-Andre Lafortune | 2020-06-30 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #422 from BurdetteLamar/master | Hiroshi SHIBATA | 2020-06-29 | 1 | -0/+12 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Added :call-seq: to RDOc for some methods | BurdetteLamar | 2020-06-28 | 1 | -0/+12 | |
|/ / / / | ||||||
* | | | | Merge pull request #413 from BurdetteLamar/master | Hiroshi SHIBATA | 2020-06-28 | 2 | -154/+691 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | RDoc enhancements | BurdetteLamar | 2020-06-25 | 1 | -17/+1 | |
| * | | | RDoc enhancements | BurdetteLamar | 2020-06-25 | 2 | -22/+22 | |
| * | | | RDoc enhancements | BurdetteLamar | 2020-06-25 | 2 | -28/+3 | |
| * | | | Rdoc enhancements | BurdetteLamar | 2020-05-06 | 2 | -154/+732 | |
* | | | | Merge pull request #420 from marcandre/performance_345 | Hiroshi SHIBATA | 2020-06-26 | 2 | -67/+69 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Use frozen string for hash key | Watson | 2020-06-25 | 2 | -67/+69 | |
* | | | | Merge pull request #418 from nobu/sync-ruby | Hiroshi SHIBATA | 2020-06-25 | 3 | -4/+5 | |
|\ \ \ \ | ||||||
| * | | | | Removed nonsense `rubygems_version` in input gemspec files | Nobuyoshi Nakada | 2020-06-25 | 1 | -1/+0 |