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.

Sign up for GitHub

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

Jump to bottom

Sync package-lock.json with package.json #4410

Merged
merged 2 commits into from
Apr 1, 2019
Merged

Sync package-lock.json with package.json #4410

merged 2 commits into from
Apr 1, 2019

Conversation

johnsaigle
Copy link
Contributor

Brings package-lock.json in sync with package.json. At some point the latter was changed without the former being committed to the repo.

Resolves #4408

@johnsaigle johnsaigle added Cleanup PR or issue introducing/requiring at least one clean-up operation Meta PR does something that organizes, upgrades, or manages the functionality of the codebase labels Mar 20, 2019
@zaliqarosli
Copy link
Contributor

zaliqarosli commented Mar 20, 2019 •
edited
Loading

not sure why mine and john's git diffs are different :/ could someone else run make dev and see what their git diff is? @maltheism @HenriRabalais

@maltheism
Copy link
Member

@zaliqarosli is right. I'm guessing my package-lock.json is similar to hers. @johnsaigle your package-lock.json has updated packages and I'm not sure why.

@johnsaigle
Copy link
Contributor Author

The latest commit makes more sense than my initial one but I can't really comment on the accuracy of all of it

@zaliqarosli zaliqarosli removed their request for review March 20, 2019 18:28
@driusan
Copy link
Collaborator

driusan commented Mar 21, 2019

I have no idea how to review this. I guess I just assume it's good based on the reviews?

PapillonMcGill
PapillonMcGill previously requested changes Apr 1, 2019
View reviewed changes
Copy link
Contributor

@PapillonMcGill PapillonMcGill left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, my mistake, these change are in the lock files.

Should this files be not tracked?

@PapillonMcGill PapillonMcGill dismissed their stale review April 1, 2019 13:43

should not have requested change

@driusan driusan merged commit 15b8d28 into aces:major Apr 1, 2019
@johnsaigle johnsaigle deleted the 190320-UpdatePackageLock branch April 1, 2019 20:48
@ridz1208 ridz1208 added this to the 21.0.0 milestone Apr 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maltheism maltheism maltheism approved these changes

@PapillonMcGill PapillonMcGill PapillonMcGill left review comments

Assignees
No one assigned
Labels
Cleanup PR or issue introducing/requiring at least one clean-up operation Meta PR does something that organizes, upgrades, or manages the functionality of the codebase
Projects
None yet
Milestone
21.0.0
Development

Successfully merging this pull request may close these issues.
6 participants
@johnsaigle @zaliqarosli @maltheism @driusan @PapillonMcGill @ridz1208