Skip to content

Merge develop into master - #17

Open
StephenHulme wants to merge 42 commits into
masterfrom
develop
Open

Merge develop into master#17
StephenHulme wants to merge 42 commits into
masterfrom
develop

Conversation

@StephenHulme

@StephenHulme StephenHulme commented Jul 3, 2026

Copy link
Copy Markdown
Member

All Submissions:

  • I've checked to ensure there aren't other open Pull Requests for the same update/change.
  • I've submitted a ticket for my issue if one did not already exist.
  • My submission passes all tests. (Please run the full test suite locally to cut down on noise from travis failures.)
  • I've used Github auto-closing keywords in the commit message or the description.
  • I've added/updated tests for this change.

New Feature Submissions:

  • I've submitted an issue that describes this feature, and received the go ahead from the maintainers.
  • My submission includes new tests.
  • My submission maintains compliance with JSON:API.

Bug fixes and Changes to Core Features:

  • I've included an explanation of what the changes do and why I'd like you to include them.
  • I've provided test(s) that fails without the change.

Test Plan:

Reviewer Checklist:

  • Maintains compliance with JSON:API
  • Adequate test coverage exists to prevent regressions

lgebhardt and others added 30 commits November 11, 2016 09:32
@lgebhardt
Bump to 0.9.0.beta1
6d6384a
@austenito @lgebhardt
Fix issue where resources received context nested in hash
bee1551 
* If caching has been enabled, however disabled for a resource, the
  context values are nested in a a 'context' key. For example:
  { context: { foo: :bar } } vs { foo: :bar }

(cherry picked from commit 0936916)
@nagirrab @lgebhardt
Allow includes to follow namespacing
348d627 
(cherry picked from commit 2f46f58)
@baroquon @lgebhardt
Fixed the indentation of meta example in README
f92b401 
(cherry picked from commit fd0826a)
@lgebhardt
Update README to use Doc Site
cb3ef23
@lgebhardt
Merge pull request JSONAPI-Resources#913 from cerebris/beta_doc_site
3bee280 
Update README to use Doc Site
@DavidMikeSimon @lgebhardt
Skip preloading of polymorphic relations, better handling of serializ…
8c98838 
…ation with partially preloaded relations, resolves JSONAPI-Resources#889

(cherry picked from commit d9d9d3f)
@Petesta @lgebhardt
Rescue JSON parsing error and return all exceptions from the parser i…
7158e52 
…n `_parser_exception`

(cherry picked from commit e144f80)
@lgebhardt
Add facility to override error object members in JR Exceptions
d7a2380 
(cherry picked from commit 854873c)
@lgebhardt
Fix 933 - Sort with has one include
506c860
@lgebhardt
Merge pull request JSONAPI-Resources#935 from cerebris/fix_933
f272f80 
Fix 933 - Sort with has one include
@lgebhardt
Rework model_name in derived resources
d46a080 
Fixes an issue where the recreated relationships might be using the wrong model_name if the model_name is changed in a resource that is derived from a non abstract resource, such as done in many of the tests.
Breaking change: Derived resources now use the model name of their base resource, if it is not abstract.
Cleans up the tests to not have the warnings about missing models.
Fixes issue in _model_class related to JSONAPI-Resources#952, and renames @model (class level) to @model_class to avoid confusion with instance level @model

Fixes JSONAPI-Resources#952, JSONAPI-Resources#654

(cherry picked from commit 280ccea)
@lgebhardt
Fix 628 CSV parsing errors (JSONAPI-Resources#937)
de7e7d3 
* Added test and potential fix for JSONAPI-Resources#628.

* Add handling for CSV parsing errors.

(cherry picked from commit 9306ec0)
@nagirrab @lgebhardt
Fix has_one polymorphism (JSONAPI-Resources#945)
4239561 
* Fix has_one polymorphism

* Add tests for has one polymorphic serialization

(cherry picked from commit 9ad4d91)
@gnfisher @lgebhardt
Catch LoadError when checkin for engine
a5b06b6 
(cherry picked from commit 31d22d1)
@DavidMikeSimon @lgebhardt
Skip preloading of polymorphic relations, better handling of serializ…
1df2b3b 
…ation with partially preloaded relations, resolves JSONAPI-Resources#889

(cherry picked from commit d9d9d3f)
@lgebhardt
Bump to 0.9.0.beta2
fd535b3
@lgebhardt
Default id to being a read only (not creatable) attribute
c058816 
Fixes JSONAPI-Resources#960

Potentially a breaking change for apps with guids

(cherry picked from commit 4f51331)
@lgebhardt
Bump to 0.9.0.beta3
66531b3
@scottgonzalez @lgebhardt
Fix wording for missing model
cc89e04 
(cherry picked from commit 57fa0ae)
@zfben @lgebhardt
fix page count when paginator is none
e8ad5a2 
(cherry picked from commit 48eaa02)
@bf4 @lgebhardt
Fix typos
6845212 
```
go get -u github.com/client9/misspell/cmd/misspell
misspell  -w -error -source=text .
```

(cherry picked from commit 726b102)
@hidde-jan @lgebhardt
Filter nil values from include param
144d487 
(cherry picked from commit 4b93707)
@lgebhardt
Bump to 0.9.0
5af1f17
@dasunpubudumal
Removing ForcedSSL line
be2fb43
@seenanair
update (gemspec): change gemspec name to sanger-jsonapi-resources and…
93ce889 
… update description for clarity
@seenanair
feature(sanger-jsonapi-resources): Add wrapper file for sanger-jsonap…
f04adaf 
…i-resources gem to ensure compatibility with RubyGems and Bundler
@seenanair
Change version number to 0.1.1 in version.rb (0.1.0 was published alr…
576455c 
…eady)
@seenanair
update README: change gem installation instructions to use sanger-jso…
3f76a46 
…napi-resources
@seenanair
update Gemfile: upgrade sqlite3 to version >= 1.4 and railties to ~> …
5174ea6 
…7.1.0 which are required for compatibility with Rails 7.1 and Ruby 3.x
seenanair and others added 12 commits June 16, 2025 16:31
@seenanair
update (gemspec): modify bundler dependency to allow versions >= 1.5 …
c8bd96a 
…and < 3.0 (ensuring compatibility with both older and newer Ruby/Rails setups, while avoiding breaking changes introduced in Bundler 3.x.) ; add runtime dependency for csv (because Ruby 3.4+ no longer includes the csv library by default)
@seenanair
refactor(test_helper): remove redundant require and update fixture pa…
a7e0701 
…th handling
@seenanair
fix(generators): add missing require statement for rails/generators i…
8295025 
…n controller and resource generators
@seenanair
fix(schema): Update schema definitions to use syntax compatible with …
3437f45 
…recent Rails versions, replacing deprecated or invalid patterns to ensure proper table and index creation.
@seenanair
feat(ci): Add GitHub Actions configuration for continuous integration…
1c3bb37 
… with Ruby and Rails testing
@seenanair
fix(gemspec): Update authors and homepage to reflect current project …
3a64ede 
…ownership and repository link
@seenanair
Merge pull request #3 from sanger/y25-318-from-develop
c4c17a4 
Y25-318 Publish gem as sanger-jsonapi-resources
@yoldas
Add compatibility for obsolete Rack status symbols
f52036b
@yoldas
Change version to 0.1.2
21092b0
@yoldas
Merge pull request #5 from sanger/y25-319-from-develop-as-psd-we-need…
27f3024 
…-to-fix-the-json-api-resource-incompatibility-with-rack-which-is-causing-422-errors-to-fail-with-a-status-of-0

Y25-319 - [PR] [Develop] Add compatibility for obsolete Rack status symbols
@TWJW-SANGER
Updating CONTRIBUTING.md and README.md prior to merge into develop
24301c5
@TWJW-SANGER
Merge pull request #15 from sanger/Y26-054_a
6fc8385 
Adding CONTRIBUTING.md

Tests are failing but nothing to do with the changes to .md files here.
@StephenHulme StephenHulme linked an issue Jul 3, 2026 that may be closed by this pull request
DPL-936-5 - As developers we need to fork JSON API 0.9.0 so we can fix a minor issues so we can upgrade rails to 6.1 to apply the security fix sanger/sequencescape#4014
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

DPL-936-5 - As developers we need to fork JSON API 0.9.0 so we can fix a minor issues so we can upgrade rails to 6.1 to apply the security fix