Skip to content

Match upstream (google/jsonapi) #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 13, 2021
Merged

Conversation

omarismail
Copy link

@omarismail omarismail commented Apr 13, 2021

Description

This PR is to keep this fork in sync with upstream (google/jsonapi) .

This is PR is comprised of

  1. A copy of RFC 3339 support for both Marshal and Unmarshal. google/jsonapi#204
  2. A modification of go mod init google/jsonapi#205.

This is done after the reversion of #6 , like what was done in upstream.

Tests

All pass

go test -v ./...
...
PASS
ok      github.com/hashicorp/jsonapi/examples   (cached)

aren55555 and others added 5 commits April 13, 2021 11:07
* RFC 3339 support for both Marshal and Unmarshal.

* Post merge cleanup

* Update request_test.go

Co-authored-by: Quetzy Garcia <[email protected]>

* Spelling

* Update request.go

Co-authored-by: Quetzy Garcia <[email protected]>

* Simplify the ISO 8601 logic. No need for the const rfc3339TimeFormat use time.RFC3339 directly.

Co-authored-by: Quetzy Garcia <[email protected]>
author Omar Ismail <[email protected]> 1618325394 -0400
committer Omar Ismail <[email protected]> 1618326429 -0400

updated mod

fix go get

fix missing merge
@omarismail omarismail requested a review from a team April 13, 2021 15:16
Copy link
Member

@chrisarcand chrisarcand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! ✅

@omarismail omarismail merged commit 353a8ff into master Apr 13, 2021
@omarismail omarismail deleted the omarismail/match-upstream branch April 13, 2021 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants