summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* * ext/json/ext/parser/parser.rl: add local variables for emacs.nobu2011-07-072-18/+32
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/ext/generator/generator.{c,h} (fbuffer_free_only_buffer): unused.nobu2011-07-071-1/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/generator/ext/generator.c (fbuffer_free): unused.nobu2011-07-071-5/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Appy patch by Laurent Arnoud <laurent@spkdev.net>Florian Frank2011-07-043-40/+14
| | | | Use Spruz::GO.go for options parsing
* Merge branch 'max_nesting_for_prettify_json' of https://github.com/spk/json ↵Florian Frank2011-07-041-9/+12
|\ | | | | | | into development
| * bin/prettify_json.rb: Set max_nesting and create_additions to false like ↵Laurent Arnoud2010-10-091-9/+12
| | | | | | | | | | | | | | | | edit_json it refers to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561839 Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
* | Add rake as development dependencyFlorian Frank2011-07-043-2/+6
| |
* | Bump up version to 1.5.4Florian Frank2011-07-048-13/+30
| |
* | Merge branch 'fix_memory_leak' of https://github.com/bigfix/json into ↵Florian Frank2011-07-049-46/+51
|\ \ | | | | | | | | | development
| * | Fix memory leak when used from multiple JRuby runtimes.John Firebaugh2011-05-189-46/+51
| | |
* | | Make default rake target testFlorian Frank2011-07-041-1/+2
| | |
* | | new orderv1.5.3Florian Frank2011-06-202-2/+2
| | |
* | | Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2011-06-2012-48/+145
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: json.gemspec json_pure.gemspec
| * | | Include travis-ci iconFlorian Frank2011-06-202-6/+2
| | | |
| * | | clobber RakefileFlorian Frank2011-06-201-1/+1
| | | |
| * | | fixed .travis.ymlFlorian Frank2011-06-201-4/+1
| | | |
| * | | configure rake as gemFlorian Frank2011-06-201-0/+1
| | | |
| * | | Add Gemfile for testsFlorian Frank2011-06-201-0/+8
| | | |
| * | | also test everythingFlorian Frank2011-06-201-0/+2
| | | |
| * | | add travis.ymlFlorian Frank2011-06-201-0/+22
| | | |
| * | | prepare new releaseFlorian Frank2011-06-203-3/+5
| | | |
| * | | Alias State#configure method as State#mergeFlorian Frank2011-06-203-0/+4
| | | | | | | | | | | | | | | | This increases duck type synonymy with Hash
| * | | Define as_json methods, so rails can make objectsFlorian Frank2011-06-201-41/+106
| | | |
| * | | Bump version to 1.5.3Florian Frank2011-06-174-23/+23
| | | |
* | | | new gemspecsFlorian Frank2011-06-202-2/+2
|/ / /
* | | gemspec needs to return spec for gem build to workFlorian Frank2011-06-151-1/+3
| | |
* | | Use new PackageTask from rubygemsv1.5.2Florian Frank2011-06-151-4/+4
| | |
* | | changed the CHANGESFlorian Frank2011-06-153-20/+23
| | |
* | | clean up superflous tabsFlorian Frank2011-06-155-30/+30
| | |
* | | renamed README -> README.rdocFlorian Frank2011-06-103-21/+19
| | |
* | | Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2011-06-099-77/+103
|\ \ \
| * | | Skip test which fails on some platformsFlorian Frank2011-05-121-1/+1
| | | |
| * | | Fix duplicate testFlorian Frank2011-05-121-39/+19
| | | |
| * | | Don't optimize calls for ducktypesFlorian Frank2011-05-125-57/+106
| | | |
| * | | Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2011-05-122-17/+25
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'remotes/github/master'Florian Frank2011-05-112-5/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pull request #59 from lorensr/masterFlorian Frank2011-05-112-1/+1
| | |\ \ \ | | | | | | | | | | | | fixed typo, changed README file extension
| | | * | | typo, README file extensionlorensr2011-02-062-1/+1
| | | | | |
| | * | | | Merge pull request #63 from vakuum/issue-60Florian Frank2011-05-112-5/+2
| | |\ \ \ \ | | | | | | | | | | | | | | flori/json#60: Incorrect pretty-print indentation
| | | * | | | flori/json#60: Incorrect pretty-print indentationClemens Fuchslocher2011-02-261-1/+1
| | | | | | |
| | | * | | | flori/json#60: Incorrect pretty-print indentationClemens Fuchslocher2011-02-262-5/+2
| | | |/ / /
| * | | | | typo, README file extensionlorensr2011-05-112-1/+1
| | | | | |
* | | | | | Create gemspec by defaultFlorian Frank2011-06-093-19/+21
| | | | | |
* | | | | | Apply patch by Cory Monty <cory.monty@gmail.com>.Florian Frank2011-06-094-5/+93
| |_|_|/ / |/| | | |
* | | | | use []= method if objectClass isn't a HashFlorian Frank2011-05-112-17/+25
|/ / / /
* | | | Merge branch 'gmaster'Florian Frank2011-05-110-0/+0
|\ \ \ \
| * | | | Revert "Put the json and json_pure gemspecs in standalone .gemspec files so ↵Florian Frank2011-05-114-89/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that they can be used by Bundler" This reverts commit dbd6343217ab77c37948d1202541ae33076155ab. Conflicts: json.gemspec json_pure.gemspec
| * | | | Revert "Add the constants.rb file to the gemspec ignore list, and don't echo ↵Florian Frank2011-05-111-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | the stdout when detecting the ragel binaries" This reverts commit a592f7ef0af4cf54fa5dad536cc0203d4084c781.
| * | | Merge pull request #72 from nono/rubygems_deprecationsFlorian Frank2011-05-112-4/+0
| |\ \ \ | | | | | | | | | | has_rdoc= and default_executable= have been deprecated
| | * | | has_rdoc= and default_executable= have been deprecatedBruno Michel2011-05-082-4/+0
| |/ / /