From a2fd8193023243300be9fcbc89b5e74d2e068ada Mon Sep 17 00:00:00 2001 From: Erik Kieckhafer Date: Tue, 4 Aug 2020 16:00:49 -0600 Subject: [PATCH 1/2] release v3.0.0-beta.9 Signed-off-by: Erik Kieckhafer --- CHANGELOG.md | 11 +++++++++++ docker-compose.yml | 2 +- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d9255f4ef..9598d87d4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +# v3.0.0-beta.9 + +### Fixes + +- fix: Update defaultParcelSize only when it exists([#295](https://github.com/reactioncommerce/reaction-admin/pull/295)) +- fix: Reaction.hasPermission method shopId ([#298](https://github.com/reactioncommerce/reaction-admin/pull/298)) + +## Contributors + +Thanks to @manizuca and @mikoscz for contributing to this release! 🎉 + # v3.0.0-beta.8 ### Features diff --git a/docker-compose.yml b/docker-compose.yml index 2197aaa858..ea44c7c201 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ networks: services: reaction-admin: - image: reactioncommerce/admin:3.0.0-beta.8 + image: reactioncommerce/admin:3.0.0-beta.9 env_file: - ./.env networks: diff --git a/package-lock.json b/package-lock.json index b677c13b46..9482b8c39c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "reaction-admin", - "version": "3.0.0-beta.8", + "version": "3.0.0-beta.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c89c8684a1..9fafbe94e5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "reaction-admin", "description": "Reaction is a modern reactive, real-time event driven ecommerce platform.", - "version": "3.0.0-beta.8", + "version": "3.0.0-beta.9", "main": "main.js", "directories": { "test": "tests" From 6f87e08516cd24ab206b1af70b753d5d39ac016c Mon Sep 17 00:00:00 2001 From: Erik Kieckhafer Date: Wed, 5 Aug 2020 10:50:10 -0600 Subject: [PATCH 2/2] chore: update changelog Signed-off-by: Erik Kieckhafer --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9598d87d4a..6914c163ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ # v3.0.0-beta.9 +### Features + +- feat: Enable mock TLS termination on calls to Hydra ([#302](https://github.com/reactioncommerce/reaction-admin/pull/302)) + ### Fixes -- fix: Update defaultParcelSize only when it exists([#295](https://github.com/reactioncommerce/reaction-admin/pull/295)) +- fix: Update defaultParcelSize only when it exists ([#295](https://github.com/reactioncommerce/reaction-admin/pull/295)) - fix: Reaction.hasPermission method shopId ([#298](https://github.com/reactioncommerce/reaction-admin/pull/298)) ## Contributors