summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Some more changes from ruby 2.7.0merge-recent-ruby-changesFlorian Frank2019-12-106-18/+103
* Use newest rubygemsFlorian Frank2019-04-292-2/+2
* Pass args all #to_json in json/add/*.Sho Hashimoto2019-04-294-8/+8
* Add LICENSE fileFlorian Frank2019-04-291-0/+56
* Merge branch 'master' of github.com:flori/jsonFlorian Frank2019-04-2918-4335/+186
|\
| * Merge pull request #376 from olleolleolle/patch-1SHIBATA Hiroshi2019-03-041-1/+1
| |\
| | * README: Docs at rubydoc.info, not on rubyforgeOlle Jonsson2019-03-031-1/+1
| |/
| * Merge branch 'master' of github.com:flori/jsonv2.2.0Florian Frank2019-02-211-1/+1
| |\
| | * Merge pull request #366 from sho-h/fix-ascii_only-documentFlorian Frank2019-02-211-1/+1
| | |\
| | | * fix JSON::Generator::State#ascii_only? document same as lib/json/pure/generat...Sho Hashimoto2019-01-081-1/+1
| | * | Add some missing ruby 2.6 changesFlorian Frank2019-02-216-91/+98
| | * | Merge pull request #369 from sho-h/fix-typoSHIBATA Hiroshi2019-01-091-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Fix a typo.Sho Hashimoto2019-01-091-1/+1
| | |/
| | * Merge pull request #362 from mrkn/update_for_bigdecimalSHIBATA Hiroshi2018-12-202-4/+38
| | |\
| | | * Fix for bigdecimal updatesKenta Murata2018-12-022-4/+38
| * | | It's more trouble than it's worth.Florian Frank2019-02-215-4224/+1
| * | | Use which to resolve to actual pathFlorian Frank2019-02-211-4/+9
| * | | [fix] 2.5 compat on JRuby 9.2 Fixnum/Bignum -> Integerkares2019-02-211-10/+33
| * | | Always use underscore for match stringFlorian Frank2019-02-212-4/+4
| * | | Upgrade version to 1.6Florian Frank2019-02-211-1/+1
| * | | Bump version to 2.2.0Florian Frank2019-02-215-5/+8
| * | | Add some missing ruby 2.6 changesFlorian Frank2019-02-216-91/+98
| * | | Fix a typo.Sho Hashimoto2019-02-211-1/+1
| * | | Fix for bigdecimal updatesKenta Murata2019-02-212-4/+38
| |/ /
| * | Merge pull request #359 from flori/pick-ruby-coreSHIBATA Hiroshi2018-12-202-10/+15
| |\ \
| | * | ext/json/parser/parser.c: do not call rb_str_resize() on Time objectpick-ruby-coreeregon2018-10-252-10/+14
| | * | Fix missed update of parser source in r62429eregon2018-10-251-0/+1
| * | | Merge pull request #363 from yui-knk/fix_typosSHIBATA Hiroshi2018-12-101-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Article is duplicatedyui-knk2018-12-101-1/+1
| | * | "load the" is duplicatedyui-knk2018-12-101-1/+1
| |/ /
| * | Merge pull request #360 from flori/remove-control-charsSHIBATA Hiroshi2018-10-311-0/+0
| |\ \
| | * | Removed control characters from gemspecSHIBATA Hiroshi2018-10-311-0/+0
| |/ /
| * | Fixup 0d1c2a0f0e62839ccc049cbd3b0810e276d1e1caSHIBATA Hiroshi2018-10-251-2/+3
| |/
| * Temporary ignored CI result of JRuby. see https://github.com/flori/json/pull/355SHIBATA Hiroshi2018-10-251-1/+1
| * Merge pull request #352 from nicolasleger/patch-1SHIBATA Hiroshi2018-10-241-2/+3
| |\
| | * [CI] Test against Ruby 2.5Nicolas Leger2018-03-261-2/+3
| * | Merge pull request #340 from lostapathy/fix_travis_widgetSHIBATA Hiroshi2018-10-231-2/+3
| |\ \ | | |/ | |/|
| | * fix link in travis widgetJoe Francis2017-10-091-2/+3
| |/
* | Does not check whether illegal utf-8 if string has ascii only.Watson2019-04-291-8/+12
* | Convert string encoding to UTF-8 only when neededWatson2019-04-291-1/+3
* | Convert String encoding using `rb_str_encode()`Watson2019-04-291-1/+1
* | Add shortcut converting to StringWatson2019-04-291-2/+9
* | Convert Hash object using rb_hash_foreach()Watson2019-04-291-22/+55
* | Only attempt to resize strings not other objectsFlorian Frank2019-04-292-2/+2
* | Test on newer rubiesFlorian Frank2019-03-141-2/+4
* | fix test as reported in #343Florian Frank2017-12-211-1/+1
|/
* Allow failing 1.9.3 on travisFlorian Frank2017-10-041-0/+1
* JSON marshalling support for Set and SortedSetJosh Kline2017-10-042-0/+39
* Merge pull request #332 from perlun/patch-3Florian Frank2017-10-041-0/+12
|\
| * README: Added note about json/add/exceptionPer Lundberg2017-06-011-0/+12