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.

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

Merge master to develop #2362

Merged
merged 17 commits into from
Apr 28, 2020
Merged

Merge master to develop #2362

merged 17 commits into from
Apr 28, 2020

Conversation

dpatil-magento
Copy link
Contributor

Description

Back merge master to develop

Related Issue

Closes #ISSUE_NUMBER.

Acceptance

Verification Stakeholders

Specification

Verification Steps

  1. Run smoke test

Screenshots / Screen Captures (if appropriate)

Checklist

  • I have updated the documentation accordingly, if necessary.
  • I have added tests to cover my changes, if necessary.

revanth0212 and others added 16 commits March 17, 2020 12:47
* Requires at least minimist 1.2.2 due to security vuln

Signed-off-by: sirugh <[email protected]>

* Switches to yarn and requires minimist 1.2.2 for security vuln

Signed-off-by: sirugh <[email protected]>
* Add unsorted PR list

* Add items to separate lists

* Finish organizing PRs in sections

* Finish highlights

* Remove entries that were part of previous releases

* Update PageBuilder to Page Builder

Co-authored-by: Devagouda <[email protected]>
* Add extensible files and directories to published packages

* Revert version bumps

Co-authored-by: Devagouda <[email protected]>
* Ignores buildpack and test directories during create-pwa

Signed-off-by: sirugh <[email protected]>

* Fix glob pattern to match sub directories AND contents

Signed-off-by: sirugh <[email protected]>

* Fixes tests and makes ignore pattern easier to construct

Signed-off-by: sirugh <[email protected]>
* Add new PRs to changelog and update compatibility table

* Fix wrong entry placement
@PWAStudioBot
Copy link
Contributor

PWAStudioBot commented Apr 28, 2020

Fails
🚫

No linked issue found. Please link a relevant open issue by adding the text "closes #<issue_number>" or "closes JIRA-<issue_number>" in your PR.

🚫 A version label is required. A maintainer must add one.
Messages
📖

Access a deployed version of this PR here. Make sure to wait for the "pwa-pull-request-deploy" job to complete.

📖 DangerCI Failures related to missing labels/description/linked issues/etc will persist until the next push or next nightly build run (assuming they are fixed).

Generated by 🚫 dangerJS against a51fd3d

Copy link
Contributor

@tjwiebell tjwiebell 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, no surprises.

@dpatil-magento dpatil-magento merged commit 2c49d2c into develop Apr 28, 2020
@dpatil-magento dpatil-magento deleted the dpatil/back-merge branch April 28, 2020 20:45
dpatil-magento added a commit that referenced this pull request Apr 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants