Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #486 from Shopify/uk-call-super-in-includedHEADmaster | Hiroshi SHIBATA | 2023-05-10 | 2 | -0/+24 |
|\ | | | | | Call `super` in `included` hook | ||||
| * | Call `super` in `included` hook | Ufuk Kayserilioglu | 2021-10-25 | 2 | -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_8 | Hiroshi SHIBATA | 2023-03-09 | 1 | -1/+1 |
|\ \ | | | | | | | JRuby requires a minimum of Java 8 | ||||
| * | | JRuby requires a minimum of Java 8 | Charles Oliver Nutter | 2023-03-08 | 1 | -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/actions | Hiroshi SHIBATA | 2023-03-08 | 1 | -8/+7 |
|\ \ | | | | | | | Actions workflow - Add new OS's, Ruby 3.1, Ruby master, Windows | ||||
| * | | [CI] Update Ruby 3.1, Ruby master, Windows | MSP-Greg | 2023-03-07 | 1 | -8/+7 |
|/ / | |||||
* | | Merge pull request #517 from headius/fix_empty_indent | Hiroshi SHIBATA | 2023-03-08 | 1 | -3/+3 |
|\ \ | | | | | | | Always indent even if empty | ||||
| * | | Always indent even if empty | Charles Oliver Nutter | 2023-02-08 | 1 | -3/+3 |
| | | | | | | | | | | | | Fixes #515 | ||||
* | | | Merge pull request #520 from r7kamura/changes-1-8-6 | Hiroshi SHIBATA | 2023-03-08 | 1 | -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.6 | r7kamura | 2023-03-06 | 1 | -0/+13 |
| |/ / | |||||
* | | | Merge pull request #521 from flori/update-ci | Hiroshi SHIBATA | 2023-03-08 | 1 | -12/+17 |
|\ \ \ | |/ / |/| | | Update CI matrix | ||||
| * | | JRuby 9.4+ on Windows is not working with current master | Hiroshi SHIBATA | 2023-03-08 | 1 | -0/+2 |
| | | | |||||
| * | | Added JRuby 9.3 | Hiroshi SHIBATA | 2023-03-08 | 1 | -0/+1 |
| | | | |||||
| * | | Skip to install test caused by https://github.com/rubygems/rubygems/pull/6430 | Hiroshi SHIBATA | 2023-03-08 | 1 | -1/+1 |
| | | | |||||
| * | | Switch to use ruby_versions callable workflow | Hiroshi SHIBATA | 2023-03-08 | 1 | -8/+10 |
| | | | |||||
| * | | Use macos-12 and ubuntu-22.04 instead of deprecated platforms. | Hiroshi SHIBATA | 2023-03-08 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #510 from nobu/fix-ragel-link | Hiroshi SHIBATA | 2023-01-23 | 2 | -5/+5 |
|\ \ | | | | | | | [DOC] Fix yet another dead link to Ragel | ||||
| * | | [DOC] Fix yet another dead link to Ragel | Nobuyoshi Nakada | 2023-01-23 | 2 | -5/+5 |
|/ / | | | | | | | And extract the same links to a footnote. | ||||
* | | Merge pull request #509 from okuramasafumi/patch-1 | Hiroshi SHIBATA | 2023-01-23 | 1 | -2/+2 |
|\ \ | | | | | | | Fix dead link to Ragel in README | ||||
| * | | Fix dead link to Ragel in README | OKURA Masafumi | 2023-01-23 | 1 | -2/+2 |
|/ / | | | | | | | The working link is http://www.colm.net/open-source/ragel/ | ||||
* | | Merge pull request #508 from unasuke/gemspec-homepage | Hiroshi SHIBATA | 2023-01-18 | 3 | -9/+9 |
|\ \ | | | | | | | Fix homepage url in gemspec | ||||
| * | | Fix homepage url in gemspec | Yusuke Nakamura | 2023-01-18 | 3 | -9/+9 |
|/ / | | | | | | | GitHub Pages now hosted on *.github.io | ||||
* | | Bump version to 2.6.3v2.6.3 | Hiroshi SHIBATA | 2022-12-05 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #470 from Shopify/remove-exception-line | Hiroshi SHIBATA | 2022-07-15 | 3 | -16/+16 |
|\ \ | | | | | | | Stop including the parser source __LINE__ in exceptions | ||||
| * | | Stop including the parser source __LINE__ in exceptions | Jean Boussier | 2021-12-06 | 3 | -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_mixed | Hiroshi SHIBATA | 2022-06-14 | 2 | -1/+5 |
|\ \ \ | | | | | | | | | bugfix json/pure mixing escaped with literal unicode raises Encoding::CompatibilityError | ||||
| * | | | fix parsing of unicode, mixing literal characters with escaped, by forcing ↵ | Ethan | 2022-02-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | encoding back to ASCII_8BIT before gsubing back into parse_string result | ||||
| * | | | test parsing of unicode, mixing literal characters with escaped | Ethan | 2022-02-08 | 1 | -0/+4 |
| |/ / | |||||
* | | | Upgrade to newest release w/out required_ruby_versionv2.6.2 | Florian Frank | 2022-05-16 | 1 | -1/+1 |
| | | | |||||
* | | | Bump version to 2.6.2 | Florian Frank | 2022-05-16 | 2 | -2/+2 |
| | | | |||||
* | | | Merge branch 'abrom-fix-parse-segfault' | Florian Frank | 2022-05-16 | 3 | -0/+17 |
|\ \ \ | |||||
| * | | | Fix parser bug for empty string allocation | Andrew Bromwich | 2022-04-20 | 3 | -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 testing | Florian Frank | 2022-05-16 | 2 | -0/+18 |
|/ / | |||||
* | | Doc: Improve documentation on JSON#parse and JSON#parse! | Hiroshi SHIBATA | 2021-12-02 | 2 | -0/+2 |
| | | | | | | | | Co-authored-by: Bruno Gomes da Silva <brunojabs@gmail.com> | ||||
* | | Merge pull request #489 from flori/gitignore | Hiroshi SHIBATA | 2021-12-02 | 1 | -0/+2 |
|\ \ | | | | | | | Ignore java artifacts | ||||
| * | | Ignore java artifacts | Hiroshi SHIBATA | 2021-12-02 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #488 from headius/bad_datetime_parse_keyword | Hiroshi SHIBATA | 2021-12-02 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Remove unknown keyword arg from DateTime.parse | ||||
| * | | Remove unknown keyword arg from DateTime.parse | Charles Oliver Nutter | 2021-12-01 | 1 | -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.1 | Hiroshi SHIBATA | 2021-10-24 | 3 | -2/+6 |
| | | |||||
* | | Merge pull request #485 from RubyElders/bump | Hiroshi SHIBATA | 2021-10-24 | 1 | -1/+1 |
|\ \ | | | | | | | Bump JSON::VERSION to 2.6.0. | ||||
| * | | Bump JSON::VERSION to 2.6.0. | Josef Šimánek | 2021-10-24 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #480 from Shopify/restore-and-update-changes | Hiroshi SHIBATA | 2021-10-16 | 1 | -0/+453 |
|\ \ | | | | | | | Restore and update changes | ||||
| * | | Write changelog for 2.6.0 | Jean Boussier | 2021-10-15 | 1 | -0/+7 |
| | | | |||||
| * | | Revert "Delete CHANGES.md because there is no maintanance resource" | Jean Boussier | 2021-10-15 | 1 | -0/+446 |
|/ / | | | | | | | This reverts commit 739e06472270180e2b0920d827237b36ab65bb5b. | ||||
* | | Delete CHANGES.md because there is no maintanance resource | Hiroshi SHIBATA | 2021-10-14 | 1 | -446/+0 |
| | | |||||
* | | Bump up json version to 2.6.0v2.6.0 | Hiroshi SHIBATA | 2021-10-14 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #473 from flori/cleanup | Hiroshi SHIBATA | 2021-07-06 | 4 | -19/+6 |
|\ | | | | | Cleanup gemspec | ||||
| * | Use Gemfile instead of Gem::Specification#add_development_dependency | Hiroshi SHIBATA | 2021-07-06 | 4 | -9/+3 |
| | | |||||
| * | Removed needless files from gemspec | Hiroshi SHIBATA | 2021-07-06 | 3 | -10/+3 |
|/ | |||||
* | Merge pull request #471 from flori/fix-actions | Hiroshi SHIBATA | 2021-05-27 | 2 | -7/+1 |
|\ | | | | | Fix GitHub Actions |