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

Remove yarn.lock from auto-generated files list (follow-up) #4459

Merged
merged 1 commit into from
Mar 13, 2019
Merged

Remove yarn.lock from auto-generated files list (follow-up) #4459

merged 1 commit into from
Mar 13, 2019

Conversation

edmorley
Copy link
Contributor

This is a follow-up to #4445, which intended to make yarn.lock no longer be treated as an auto-generated file (to fix #4348), however only removed the tests rather than also the handling in generated.rb.

As of this PR, b36ea7a is now fully reverted.

Fixes #4348.

This is a follow-up to #4445, which intended to make `yarn.lock` no
longer be treated as an auto-generated file (to fix #4348), however
only removed the tests rather than also the handling in `generated.rb`.

As of this PR, b36ea7a is now fully reverted.

Fixes #4348.
@Alhadis Alhadis merged commit 3bc8185 into github-linguist:master Mar 13, 2019
@Alhadis
Copy link
Collaborator

Alhadis commented Mar 13, 2019

Thanks! This was my blunder... 😓

@pchaigno pchaigno mentioned this pull request Mar 13, 2019
@edmorley
Copy link
Contributor Author

Many thanks :-)

@edmorley edmorley deleted the make-yarn.lock-not-autogenerated branch March 13, 2019 10:07
@lildude
Copy link
Member

lildude commented Mar 13, 2019

@Alhadis Hmmm, merging this whilst the release PR was pending has caused a bit of a complication WRT the versions and contents 😞 I'm going to need to get a bit creative to get this into v7.3.1

@Alhadis
Copy link
Collaborator

Alhadis commented Mar 14, 2019

Sorry about that. :/ If I'd known that it wasn't possible to squeeze in last minute changes, I wouldn't have been so quick to merge.

@lildude lildude mentioned this pull request Mar 14, 2019
@github-linguist github-linguist locked as resolved and limited conversation to collaborators Jun 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reconsidering auto-detecting Yarn files as auto-generated
3 participants