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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Apr 13, 2021
Merged

Match upstream (google/jsonapi) #7

merged 5 commits into from
Apr 13, 2021

Conversation

@omarismail
Copy link

@omarismail omarismail commented Apr 13, 2021 •
edited
Loading

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
@aren55555 @omarismail
Revert "Add RFC3339 timestamp (google#201)" (google#203)
ac104c8 
This reverts commit c0ee6d2.
@aren55555 @quetzyg @omarismail
RFC 3339 support for both Marshal and Unmarshal. (google#204)
0223236 
* 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]>
@aren55555 @omarismail
go mod init (google#205)
89dd8d2
@omarismail
parent 89dd8d2
b182533 
author Omar Ismail <[email protected]> 1618325394 -0400
committer Omar Ismail <[email protected]> 1618326429 -0400

updated mod

fix go get

fix missing merge
@omarismail
Merge branch 'master' into omarismail/match-upstream
28a784e
@omarismail omarismail requested a review from a team April 13, 2021 15:16
chrisarcand
chrisarcand approved these changes Apr 13, 2021
View reviewed changes
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

Reviewers

1 more reviewer

@chrisarcand chrisarcand chrisarcand approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@omarismail @chrisarcand @aren55555