summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
* | Merge branch 'master' of github.com:flori/jsonFlorian Frank2017-06-211-0/+1
|\ \
| * \ Merge pull request #335 from hsbt/added-bigdecimalFlorian Frank2017-06-211-0/+1
| |\ \ | | |/ | |/|
| | * Added missing bigdecimal for its testSHIBATA Hiroshi2017-06-161-0/+1
| |/
* | Merge branch 'master' of storage.gate.ping.de:/git/jsonFlorian Frank2017-06-211-17/+21
|\ \ | |/
| * Merge pull request #330 from perlun/patch-1Florian Frank2017-05-311-17/+21
| |\
| | * Merge branch 'master' into patch-1Florian Frank2017-05-311-0/+4
| | |\ | | |/ | |/|
| * | Merge pull request #331 from perlun/patch-2Florian Frank2017-05-311-1/+1
| |\ \
| | * | Fixed json_create example to use create_additions = truePer Lundberg2017-05-311-1/+1
| |/ /
| | * README: Fixed code examples to start in the left-most columnPer Lundberg2017-05-311-17/+17
| |/
* | simplecov breaks testing => removedFlorian Frank2017-06-214-7/+1
|/
* Moving json java gemspec from here to therev2.1.0Florian Frank2017-04-182-1/+1
* Merge branch 'fix_jruby_gemspec_bug' of https://github.com/xb/jsonFlorian Frank2017-04-183-7/+3
|\
| * Back-out change of directory of json-java.gemspec.Xuân Baldauf2017-03-273-7/+3
* | Use assert_raiseFlorian Frank2017-04-181-2/+2
* | newest versionFlorian Frank2017-04-182-1/+1