summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge pull request #300 from kAworu/patch-1Florian Frank2016-07-291-1/+1
| |\
| | * README.md typo fixAlexandre Perrin2016-07-291-1/+1
| |/
* | Add change to CHANGESv2.0.2Florian Frank2016-07-261-0/+4
|/
* Merge branch 'master' of github.com:flori/jsonFlorian Frank2016-07-264-6/+7
|\
| * Merge pull request #294 from hsbt/use-assert-raiseFlorian Frank2016-07-141-3/+3
| |\
| | * Fix inconsistency usage for assertion methodsSHIBATA Hiroshi2016-07-141-3/+3
| |/
| * Merge pull request #292 from nobu/patch-1Florian Frank2016-07-131-0/+1
| |\
| | * Suppress a warningNobuyoshi Nakada2016-07-081-0/+1
| * | Merge pull request #293 from lencioni/patch-1Florian Frank2016-07-131-1/+1
| |\ \ | | |/ | |/|
| | * Fix typo "improvemed" => "improved"Joe Lencioni2016-07-121-1/+1
| |/
| * Merge pull request #290 from chottoda/fix-typo-rfc7159Florian Frank2016-07-051-2/+2
| |\
| | * [Now complies to newest JSON RFC 7159.](https://github.com/chottoda/json/blob...chottoda2016-07-051-2/+2
| |/
* | Fix issue #296 when parsing frozen stringsFlorian Frank2016-07-269-84/+103
* | Add required_ruby_version to json_pure specFlorian Frank2016-07-193-1/+3
* | Test parsing some simple singular valuesFlorian Frank2016-07-071-1/+12
|/
* Bump version to 2.0.1v2.0.1Florian Frank2016-07-014-5/+5
* Rename to be shorterFlorian Frank2016-07-011-0/+0
* Use markdown for CHANGESFlorian Frank2016-07-011-93/+154
* Fix problem when Parser is defined on top levelFlorian Frank2016-07-011-1/+1
* Add to CHANGESFlorian Frank2016-07-011-0/+3
* Stores current nesting on stackFlorian Frank2016-07-013-87/+76
* RB_GC_GUARD to protect from premature GCPete Johns2016-07-011-0/+1
* Add to CHANGESv2.0.0Florian Frank2016-07-013-23/+26
* And stay thereFlorian Frank2016-06-225-2/+3
* Stop testing on 1.9.3Florian Frank2016-06-211-1/+0
* Add ruby version requirement to gemspecFlorian Frank2016-06-212-0/+1
* Make it interactiveFlorian Frank2016-06-211-2/+9
* Merge branch 'nobu-trunk'Florian Frank2016-06-2132-112/+147
|\
| * Fix some merge problemsFlorian Frank2016-06-215-145/+20
| * Support 1.9 ruby's OpenStructFlorian Frank2016-06-211-0/+8
| * Add frozen_string_literal: falseNobuyoshi Nakada2016-06-2127-0/+27
| * Optional hash in rb_scan_argsNobuyoshi Nakada2016-06-211-0/+32
| * Exception encodingNobuyoshi Nakada2016-06-213-2/+44
| * Use rb_encodingNobuyoshi Nakada2016-06-212-89/+68
| * Remove unnecessary conversionNobuyoshi Nakada2016-06-212-2/+32
| * Use enumNobuyoshi Nakada2016-06-212-8/+58
| * Use assert_raise consistentlyNobuyoshi Nakada2016-06-215-47/+47
| * Remove useless methodsNobuyoshi Nakada2016-06-211-8/+0
| * Append newline at EOFNobuyoshi Nakada2016-06-211-1/+1
| * regenerate parserAaron Patterson2016-06-211-0/+2
| * resize strings after parsingAaron Patterson2016-06-211-0/+2
* | Merge branch 'master' of github.com:flori/jsonFlorian Frank2016-06-212-0/+4
|\ \ | |/ |/|
| * Merge pull request #260 from tenderlove/memuseFlorian Frank2016-06-112-0/+4
| |\
| | * regenerate parserAaron Patterson2016-06-111-0/+2
| | * resize strings after parsingAaron Patterson2016-06-111-0/+2
| |/
* | Merge more changes from ruby coreFlorian Frank2016-06-215-138/+171
* | Easy diffingFlorian Frank2016-06-211-0/+11
* | Adapt to ruby integer unificationFlorian Frank2016-06-212-3/+43
|/
* Merge pull request #283 from stomar/remove-commentsFlorian Frank2016-06-079-9/+0
|\
| * Remove comments from core classes in json/addMarcus Stollsteimer2016-04-259-9/+0