Update lodash to fix audit failures #2167
Merged
+4
−4
Conversation
This file contains hidden or 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
Contributor
|
Yes, please go ahead and resolve the merge conflicts. |
Author
|
Good morning @wbt, Sorry for all the commits. We might want to squish the commits, if that is a option. Though this PR should be good to merge. |
Contributor
|
I'm still seeing conflicts, though squash and merge should be an option when ready. |
Author
|
Good morning @wbt,
Below is what I see, is there another location I should check for conflicts? I've refreshed the page a couple times, just in case.
|
Contributor
|
That's kind of odd. Here's what I see, also refreshing the page: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Hello Winston developers,
When working on this PR: #2166, there was some
lodashvulnerabilities that looked concerning. I updated the package accordingly. The changes successfully tested in both node 10 and node 4.This is a separate PR so that you can decide whether you wish to include these changes.
Note: Due to the CHANGELOG, there will likely be a merge conflict between these two PRs. If you'd like I can combine them (this and #2166) into a single PR.