summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* | Update rubies to test onFlorian Frank2016-06-071-1/+0
* | Update rubies to test onFlorian Frank2016-06-071-3/+1
* | Allow usage of simplecov with START_SIMPLECOV=1Florian Frank2016-06-072-0/+6
* | Use ~> 2.0 test-unit that runs on 1.8 rubies as wellFlorian Frank2016-06-074-8/+8
* | Move dependencies into gemspec filesFlorian Frank2016-06-074-9/+9
* | Also build against 2.2.3Rebecca Skinner2016-06-071-73/+131
|\ \ | |/
| * Merge pull request #278 from zeroed/masterFlorian Frank2016-04-061-75/+133
| |\
| | * Update README.md with formattingEdoardo Rossi2016-04-061-75/+133
| |/
* | Move simplecov to test_helper.rbFlorian Frank2016-06-032-14/+2
* | Treat ASCII_8BIT as UTF-8 by defaultFlorian Frank2016-06-037-97/+95
* | Force ASCII 8bit to be UTF-8 and hope for the bestFlorian Frank2016-06-032-85/+93
* | Only support newer Rubies e. g. EncodingFlorian Frank2016-06-034-114/+48
* | Test common interfaceFlorian Frank2016-06-032-15/+27
* | Use better name for this featureFlorian Frank2016-06-024-8/+8
* | Remove quirks modeFlorian Frank2016-06-0219-619/+143
* | Update documentation for RFC 7159 supportFlorian Frank2016-06-021-11/+0
* | Change rfc referenceFlorian Frank2016-06-022-24/+6
* | Support newer rubiesFlorian Frank2016-06-021-9/+1
* | current RFC addedFlorian Frank2016-06-021-0/+899
* | Allow usage of simplecov with START_SIMPLECOV=1Florian Frank2016-06-022-0/+6
* | Declare encodingFlorian Frank2016-06-022-0/+3
|/
* Merge branch 'v1.8'Florian Frank2016-02-252-8/+0
|\
| * Use ~> 2.0 test-unit that runs on 1.8 rubies as wellFlorian Frank2016-02-254-8/+8
| * Only test main 2.2 branchFlorian Frank2016-02-251-3/+0