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

Push socklist detection through to main by cherry-picking commits #111

Merged
merged 5 commits into from
Feb 20, 2022
Merged

Conversation

Dreamy-Jazz
Copy link
Contributor

As per https://en.wikipedia.org/wiki/Template_talk:SPI_report#Proposed_change_to_sock_list the socklist template is going to be used in Twinkle. The patch is at wikimedia-gadgets/twinkle#1509 and has been merged into source. All that is from it being used on enwiki is a deployment. Because of this, and because there is discussion about changing the preload form to use socklist soon, the changes to support the socklist in -dev should be merged into main soon so that those using the main version of spihelper do have their version break.

This pull request has cherry-picked the relevant commits from the develop branch so that only the socklist detection code is a part of this pull request. I have tested the code currently in Dreamy-Jazz/main (which contains the cherry-picked commits) to ensure the socklist code works with the older version of spihelper and my testing brought no errors.

@Dreamy-Jazz
Copy link
Contributor Author

Dreamy-Jazz commented Feb 19, 2022

The failing check in eslint is due to code already in the main version of spihelper and is a complaint about an unused variable. This might be worth fixing, but as this patch is meant to be a hotfix it could always wait (as it has no effect on the running of spihelper anyway).

@GeneralNotability GeneralNotability merged commit 26a7534 into GeneralNotability:main Feb 20, 2022
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.

None yet

3 participants