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

fix: merge qna settings from generated files in js runtime #3981

Merged
merged 9 commits into from
Sep 7, 2020

Conversation

VanyLaw
Copy link
Contributor

@VanyLaw VanyLaw commented Sep 2, 2020

Description

Merge settings from generated settings files (e.g. QnA, Luis settings) in js runtime.

change archiver and its dependency bl package version because security check CVE-2020-8244 failed.

Task Item

#minor

Screenshots

@coveralls
Copy link

coveralls commented Sep 2, 2020

Coverage Status

Coverage remained the same at 56.73% when pulling 695bd67 on zim/merge-settings into c38b708 on main.

luhan2017
luhan2017 previously approved these changes Sep 4, 2020
@luhan2017 luhan2017 merged commit 664addc into main Sep 7, 2020
@luhan2017 luhan2017 deleted the zim/merge-settings branch September 7, 2020 03:20
@cwhitten cwhitten mentioned this pull request Nov 13, 2020
lei9444 pushed a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
…#3981)

* nodejs runtime: merge settings from generated files

* update bl version in yarn.lock to solve CVE-2020-8244

* fix CVE-2020-8244

* Revert "fix CVE-2020-8244"

This reverts commit fd78a757a9d4bcf9f420685e0517eceb120a8f0c.

* Revert "update bl version in yarn.lock to solve CVE-2020-8244"

This reverts commit d3e135d83ee55006256db60717fc1b0d93326e07.

Co-authored-by: Zichuan Ma <zim@microsoft.com>
Co-authored-by: Lu Han <32191031+luhan2017@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants