Merge changes from upstream #58
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
* docs: mention git branches, GitHub forks, manual testing * space * remove advice about squashing and merging. not needed imo * mention "fixes 123" trick for closing GitHub issues
…#1766) Bumps [eslint](https://github.com/eslint/eslint) from 8.33.0 to 8.37.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v8.33.0...v8.37.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update friendlywelcome.js Add welcome-copyright to the welcome module * Update friendlywelcome.js add comma * fix template parameters --------- Co-authored-by: NovemLinguae <[email protected]>
…#1772) Bumps [eslint](https://github.com/eslint/eslint) from 8.37.0 to 8.39.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v8.37.0...v8.39.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* add uw-fringe1-4 * add commas * fix lint * Update twinklewarn.js del uw-fringe4 * Update twinklewarn.js rm stray comma
- bump jest from v27 to v29 - bump mock-mediawiki to v1.4.0 - install jest-environment-jsdom, needed for jest v29 to work - adjust snapshot test syntax a bit, to work with jest v29
* add dependency notes to DEVELOPER.md * add jest-environment-jsdom
Now that we're finally on the latest version of Jest, it should be safe to update all our npm dependencies. These are all **dev** dependencies and have no chance of breaking the Twinkle build used on-wiki. Since these are all dev dependencies, the only testing needed should be 1) make sure CI passes and 2) make sure `npm start` works. Tested, works.
) Hotfix for https://phabricator.wikimedia.org/T337893. Already deployed by @MusikAnimal Co-authored-by: MusikAnimal
I had to dig into this code to explore a bug, and I found it confusing. This renames some variables, and changes the wording of some things on the Wikipedia:Twinkle/Preferences screen. Should be no change in functionality.
- add comment - capitalize a template name - remove dead code (the template W-short does not support the parameter heading=true) Related wikimedia-gadgets#1785
* tag: add namespace rules for redirect tags * comment with stack overflow link * change mainspaceOnly to not allow talk namespace * rebase * mention CC BY-SA 4.0 * merge conflict * use string.endsWith()
…adgets#1637) * sanitized-css: don't tick <noinclude> check box * refactor based on code review suggestion Co-authored-by: Siddharth VP <[email protected]> * fix * Morebits.pageNameNorm.startsWith * Morebits.pageNameNorm.startsWith * includes() --------- Co-authored-by: Siddharth VP <[email protected]>
) * Update friendlytag.js added media and emoji redirect templates * Update friendlytag.js * fix front end code of flag checkbox. back end is still broken * remove optional params from {{R from emoji}} --------- Co-authored-by: NovemLinguae <[email protected]>
* Update twinkle.js * Update friendlywelcome.js * Update twinklearv.js * Update twinklefluff.js * Update twinklewarn.js * Fix lint error * Elaborate comment * Optimize: only get/set prefills on demand * Call prototype hasOwnProperty() * Simplify * comments --------- Co-authored-by: NovemLinguae <[email protected]>
* Fix double punctuation issues at AIV * fix double ternary * refactor --------- Co-authored-by: NovemLinguae <[email protected]>
* fix merge conflict * simplify * ce
…ia-gadgets#1784) * add {{r from airport code}} and {{r from airline code}} * restriction: insideMainspaceOnly * errant spaces --------- Co-authored-by: NovemLinguae <[email protected]>
) * add {{WikiProject Women in Red invite}} * readd, accidentally deleted? * fix WP spelling, fix template name * alphabetize --------- Co-authored-by: NovemLinguae <[email protected]>
* alphabetized "Problem user welcome templates" * Alphabetized "Problem user welcome templates" * final commit
`npm start` tested, works. If CI passes, this should be safe to merge. Will likely resolve the 2 pending dependabot PRs.
mdaniels5757
force-pushed
the
merge-changes-upstream
branch
from
ffb62a8 to
ca13cbd
Compare
manual fixes
…lt of page move (wikimedia-gadgets#2091) * change {{welcomeunsourced}} to {{welcome-unsourced}} as result of page move * welcome: changed placement of {{welcome-unsourced}} to maintain alphabetization
* arv: refactor SPI report generation * fix linter error --------- Co-authored-by: NovemLinguae <[email protected]> Co-authored-by: NovemLinguae <[email protected]>
{{Now Commons}} is a CSD, not a tag.
* block: add regression test regression test for wikimedia-gadgets#2106 * shorten function name
* DEVELOPER.md: add checklist for CSD patches * mention defaultConfig
mainly to fix this warning in my console:
I doubt TTO wants to be contacted directly with questions
This error message can occur when a template is missing onwiki. But it acts like it is because the user intentionally did not type a reason. I replaced it with a more neutral message.
* tag: add tests for checkIncompatible() Writing automated tests for this gives me more confidence that I didn't make a mistake in PR wikimedia-gadgets#2103 * expand docblock * rename variable, extract variable
* eslint: fix no-return-assign manual fix * use sum++ instead of ternary, easier to read * use .filter() instead of .reduce() * fix linter error * add test
manual fixes using F2 (rename variable) in VS Code. just one module for now. easier to test, and so I can get some confidence in this way of doing fixes before I move on to other modules
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.
No description provided.