-
Notifications
You must be signed in to change notification settings - Fork 369
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VanyLaw
requested review from
benbrown,
boydc2014,
carlosscastro and
luhan2017
as code owners
September 2, 2020 09:38
VanyLaw
requested review from
a-b-r-o-w-n,
beyackle,
cwhitten,
srinaath and
tonyanziano
as code owners
September 2, 2020 13:27
luhan2017
previously approved these changes
Sep 4, 2020
luhan2017
approved these changes
Sep 7, 2020
Merged
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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