summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #486 from Shopify/uk-call-super-in-includedHEADmasterHiroshi SHIBATA2023-05-102-0/+24
|\ | | | | Call `super` in `included` hook
| * Call `super` in `included` hookUfuk Kayserilioglu2021-10-252-0/+24
| | | | | | | | | | | | | | | | The C extension defines an `included` hook for the `JSON::Ext::Generator::GeneratorMethods::String` module but neglects to call `super` in the hook. This can break the functionality of various other code that rely on the fact that `included` on `Module` will always be called.
* | Merge pull request #516 from headius/java_8Hiroshi SHIBATA2023-03-091-1/+1
|\ \ | | | | | | JRuby requires a minimum of Java 8
| * | JRuby requires a minimum of Java 8Charles Oliver Nutter2023-03-081-1/+1
|/ / | | | | | | | | More recent JDKs will reject this command line because 1.6 is too old to build for.
* | Merge pull request #491 from MSP-Greg/actionsHiroshi SHIBATA2023-03-081-8/+7
|\ \ | | | | | | Actions workflow - Add new OS's, Ruby 3.1, Ruby master, Windows
| * | [CI] Update Ruby 3.1, Ruby master, WindowsMSP-Greg2023-03-071-8/+7
|/ /
* | Merge pull request #517 from headius/fix_empty_indentHiroshi SHIBATA2023-03-081-3/+3
|\ \ | | | | | | Always indent even if empty
| * | Always indent even if emptyCharles Oliver Nutter2023-02-081-3/+3
| | | | | | | | | | | | Fixes #515
* | | Merge pull request #520 from r7kamura/changes-1-8-6Hiroshi SHIBATA2023-03-081-0/+13
|\ \ \ | | | | | | | | Add missing changelog entries for 1.8.5 and 1.8.6
| * | | Add missing changelog entries for 1.8.5 and 1.8.6r7kamura2023-03-061-0/+13
| |/ /
* | | Merge pull request #521 from flori/update-ciHiroshi SHIBATA2023-03-081-12/+17
|\ \ \ | |/ / |/| | Update CI matrix
| * | JRuby 9.4+ on Windows is not working with current masterHiroshi SHIBATA2023-03-081-0/+2
| | |
| * | Added JRuby 9.3Hiroshi SHIBATA2023-03-081-0/+1
| | |
| * | Skip to install test caused by https://github.com/rubygems/rubygems/pull/6430Hiroshi SHIBATA2023-03-081-1/+1
| | |
| * | Switch to use ruby_versions callable workflowHiroshi SHIBATA2023-03-081-8/+10
| | |
| * | Use macos-12 and ubuntu-22.04 instead of deprecated platforms.Hiroshi SHIBATA2023-03-081-3/+3
|/ /
* | Merge pull request #510 from nobu/fix-ragel-linkHiroshi SHIBATA2023-01-232-5/+5
|\ \ | | | | | | [DOC] Fix yet another dead link to Ragel
| * | [DOC] Fix yet another dead link to RagelNobuyoshi Nakada2023-01-232-5/+5
|/ / | | | | | | And extract the same links to a footnote.
* | Merge pull request #509 from okuramasafumi/patch-1Hiroshi SHIBATA2023-01-231-2/+2
|\ \ | | | | | | Fix dead link to Ragel in README
| * | Fix dead link to Ragel in READMEOKURA Masafumi2023-01-231-2/+2
|/ / | | | | | | The working link is http://www.colm.net/open-source/ragel/
* | Merge pull request #508 from unasuke/gemspec-homepageHiroshi SHIBATA2023-01-183-9/+9
|\ \ | | | | | | Fix homepage url in gemspec
| * | Fix homepage url in gemspecYusuke Nakamura2023-01-183-9/+9
|/ / | | | | | | GitHub Pages now hosted on *.github.io
* | Bump version to 2.6.3v2.6.3Hiroshi SHIBATA2022-12-052-2/+2
| |
* | Merge pull request #470 from Shopify/remove-exception-lineHiroshi SHIBATA2022-07-153-16/+16
|\ \ | | | | | | Stop including the parser source __LINE__ in exceptions
| * | Stop including the parser source __LINE__ in exceptionsJean Boussier2021-12-063-16/+16
| | | | | | | | | | | | | | | | | | It makes testing for JSON errors very tedious. You either have to use a Regexp or to regularly update all your assertions when JSON is upgraded.
* | | Merge pull request #483 from notEthan/unicode_mixedHiroshi SHIBATA2022-06-142-1/+5
|\ \ \ | | | | | | | | bugfix json/pure mixing escaped with literal unicode raises Encoding::CompatibilityError
| * | | fix parsing of unicode, mixing literal characters with escaped, by forcing ↵Ethan2022-02-081-1/+1
| | | | | | | | | | | | | | | | encoding back to ASCII_8BIT before gsubing back into parse_string result
| * | | test parsing of unicode, mixing literal characters with escapedEthan2022-02-081-0/+4
| |/ /
* | | Upgrade to newest release w/out required_ruby_versionv2.6.2Florian Frank2022-05-161-1/+1
| | |
* | | Bump version to 2.6.2Florian Frank2022-05-162-2/+2
| | |
* | | Merge branch 'abrom-fix-parse-segfault'Florian Frank2022-05-163-0/+17
|\ \ \
| * | | Fix parser bug for empty string allocationAndrew Bromwich2022-04-203-0/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | When `HAVE_RB_ENC_INTERNED_STR` is enabled it is possible to pass through a null pointer to `rb_enc_interned_str` resulting in a segfault Fixes #495
* | | Add all_images gem for local testingFlorian Frank2022-05-162-0/+18
|/ /
* | Doc: Improve documentation on JSON#parse and JSON#parse!Hiroshi SHIBATA2021-12-022-0/+2
| | | | | | | | Co-authored-by: Bruno Gomes da Silva <brunojabs@gmail.com>
* | Merge pull request #489 from flori/gitignoreHiroshi SHIBATA2021-12-021-0/+2
|\ \ | | | | | | Ignore java artifacts
| * | Ignore java artifactsHiroshi SHIBATA2021-12-021-0/+2
| | |
* | | Merge pull request #488 from headius/bad_datetime_parse_keywordHiroshi SHIBATA2021-12-021-1/+1
|\ \ \ | |/ / |/| | Remove unknown keyword arg from DateTime.parse
| * | Remove unknown keyword arg from DateTime.parseCharles Oliver Nutter2021-12-011-1/+1
|/ / | | | | | | | | | | | | This snuck in while addding tests for the `create_additions` feature. Caught by JRuby when we added the `limit` option to the Date/DateTime parsing methods, which causes this to be rejected as an unknown keyword.
* | Bump version to v2.6.1v2.6.1Hiroshi SHIBATA2021-10-243-2/+6
| |
* | Merge pull request #485 from RubyElders/bumpHiroshi SHIBATA2021-10-241-1/+1
|\ \ | | | | | | Bump JSON::VERSION to 2.6.0.
| * | Bump JSON::VERSION to 2.6.0.Josef Šimánek2021-10-241-1/+1
|/ /
* | Merge pull request #480 from Shopify/restore-and-update-changesHiroshi SHIBATA2021-10-161-0/+453
|\ \ | | | | | | Restore and update changes
| * | Write changelog for 2.6.0Jean Boussier2021-10-151-0/+7
| | |
| * | Revert "Delete CHANGES.md because there is no maintanance resource"Jean Boussier2021-10-151-0/+446
|/ / | | | | | | This reverts commit 739e06472270180e2b0920d827237b36ab65bb5b.
* | Delete CHANGES.md because there is no maintanance resourceHiroshi SHIBATA2021-10-141-446/+0
| |
* | Bump up json version to 2.6.0v2.6.0Hiroshi SHIBATA2021-10-141-1/+1
|/
* Merge pull request #473 from flori/cleanupHiroshi SHIBATA2021-07-064-19/+6
|\ | | | | Cleanup gemspec
| * Use Gemfile instead of Gem::Specification#add_development_dependencyHiroshi SHIBATA2021-07-064-9/+3
| |
| * Removed needless files from gemspecHiroshi SHIBATA2021-07-063-10/+3
|/
* Merge pull request #471 from flori/fix-actionsHiroshi SHIBATA2021-05-272-7/+1
|\ | | | | Fix GitHub Actions