Merge branch 'develop' into fix/discount-regions-validation

medusajs · Dec 8, 2022 · dbe2524 · dbe2524
2 parents 5240972 + 2b2ea15
commit dbe2524
Show file tree

Hide file tree

Showing 890 changed files with 101,118 additions and 38,006 deletions.
diff --git a/.github/workflows/trigger-staging-release.yml b/.github/workflows/trigger-staging-release.yml
@@ -15,4 +15,4 @@ jobs:
           -H "Authorization: Bearer ${{secrets.STAGING_ACCESS_TOKEN}}" \
           -H "Accept: application/vnd.github.v3+json" \
           https://api.github.com/repos/@medusajs/medusa-staging/actions/workflows/deploy.yml/dispatches \
-          -d '{"ref":"main"}'
+          -d '{"ref":"main"}'
diff --git a/docs-util/fixture-gen/.babelrc.js b/docs-util/fixture-gen/.babelrc.js
diff --git a/docs-util/fixture-gen/.gitignore b/docs-util/fixture-gen/.gitignore
diff --git a/docs-util/fixture-gen/__tests__/admin/auth.js b/docs-util/fixture-gen/__tests__/admin/auth.js
diff --git a/docs-util/fixture-gen/__tests__/admin/collection.js b/docs-util/fixture-gen/__tests__/admin/collection.js
diff --git a/docs-util/fixture-gen/__tests__/admin/customer.js b/docs-util/fixture-gen/__tests__/admin/customer.js
diff --git a/docs-util/fixture-gen/__tests__/admin/discount.js b/docs-util/fixture-gen/__tests__/admin/discount.js
diff --git a/docs-util/fixture-gen/__tests__/admin/gift-card.js b/docs-util/fixture-gen/__tests__/admin/gift-card.js