Skip to content
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

chore: Merge master to develop and manage conflict #3570

Merged
merged 21 commits into from
Mar 29, 2023
Merged

chore: Merge master to develop and manage conflict #3570

merged 21 commits into from
Mar 29, 2023

Conversation

adrien2p
Copy link
Member

@adrien2p adrien2p commented Mar 24, 2023 •
edited
Loading

FIXES CORE-1278

@vercel
Copy link

vercel bot commented Mar 24, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment
Name Status Preview Comments Updated
medusa-docs ⬜️ Ignored (Inspect) Mar 29, 2023 at 7:28AM (UTC)

@changeset-bot
Copy link

changeset-bot bot commented Mar 24, 2023 •
edited
Loading

⚠️ No Changeset found

Latest commit: 39be4a8

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

shahednasser
shahednasser approved these changes Mar 24, 2023
View reviewed changes
Copy link
Member

@shahednasser shahednasser left a comment

Choose a reason for hiding this comment

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

Docs LGTM

@olivermrbl
Copy link
Contributor

@adrien2p I would like us to handle the documentation merge in a different PR, as it clutters this one.

Also, I'd like @shahednasser to be responsible for that :)

@adrien2p
Copy link
Member Author

No problem @olivermrbl i can revert all documentation related changes 👌

@adrien2p adrien2p marked this pull request as ready for review March 27, 2023 10:43
@adrien2p adrien2p requested a review from a team as a code owner March 27, 2023 10:43
@adrien2p adrien2p requested review from fPolic and olivermrbl March 28, 2023 09:38
@adrien2p
Copy link
Member Author

@fPolic could I get you to look at the new hook usage to be sure I did not insert an issue :) it should be fine but just a second pair of eyes just in case 👍

fPolic
fPolic approved these changes Mar 28, 2023
View reviewed changes
Copy link
Contributor

@fPolic fPolic left a comment

Choose a reason for hiding this comment

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

LGTM @adrien2p 💪

packages/medusa/src/services/product-variant.ts Outdated Show resolved Hide resolved
@olivermrbl olivermrbl changed the title merge master to develop and manage conflict chore: Merge master to develop and manage conflict Mar 28, 2023
olivermrbl
olivermrbl approved these changes Mar 28, 2023
View reviewed changes
Copy link
Contributor

@olivermrbl olivermrbl left a comment

Choose a reason for hiding this comment

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

LGTM

@olivermrbl olivermrbl merged commit 7f120e5 into develop Mar 29, 2023
@olivermrbl olivermrbl deleted the chores/merge-master branch March 29, 2023 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olivermrbl olivermrbl olivermrbl approved these changes

@shahednasser shahednasser shahednasser approved these changes

@fPolic fPolic fPolic approved these changes

Assignees
No one assigned
Labels
version: minor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@adrien2p @olivermrbl @fPolic @shahednasser