Repository navigation
fix: secure html module removes target attribute from links #2011 - #2012
Merged
Merged
Conversation
Contributor
Author
|
@NGPixel can you please CR this? The shortest PR you have ever seen :-) |
NGPixel
approved these changes
Jun 7, 2020
jionggyu
pushed a commit
to jionggyu/wiki-2.5.302-patch
that referenced
this pull request
Jul 9, 2024
Closed
1 of 3 tasks
dylan-hart
added a commit
to dylan-hart/wiki
that referenced
this pull request
Aug 30, 2026
…e-overnight-consolidated-2026-08-25 Resolves overlapping overnight-batch conflicts: duplicate test coverage added independently for WTable/WDialog/WMenu/anchoredPosition (frontend), theme.js/ url-limit.js (blocks), scheduler.test.ts/system.test.ts/pageProblems.test.ts/ rateLimits.test.ts/security.test.ts (backend), the e2e assets upload spec, and two independently-added quality.yml check steps (i18n:check + locales:check, both kept). schema.ts conflicts were comment-wording only, no schema drift. backend/locales/en.json is reconciled as a full key union of both sides (no value conflicts except trustProxyHint, resolved in favor of the version that matches the trustProxyAddresses feature already present) -- a naive text-diff resolution would have silently dropped ~260 live keys (mail.* templates read by backend/models/mail.ts, editor conflict-resolution UI, etc.) that the "theirs" branch's snapshot simply predated. Also fixes two issues surfaced only once both sides landed together: - backend/models/storage.test.ts had a duplicate `ensureTemporal` import (both branches added it independently in non-conflicting diff hunks). - Two independent overnight batches each generated the same drizzle migration (redundant-index cleanup, OpenProject requarks#2012) under different timestamps; kept 20260826014905_main, dropped the later byte-identical duplicate 20260826045647_main. - backend/models/rateLimits.test.ts's ban-counting assertion didn't match the model's actual (and correctly documented) behavior -- the attempt that trips a ban is itself counted as a hit. Corrected the assertion rather than the model. Scoped verification: backend typecheck + oxlint clean; frontend + blocks oxlint clean; DB-backed backend suites (schema.test.ts, pageProblems.test.ts, rateLimits.test.ts) and the touched non-DB suites all green against a local postgres; touched frontend/blocks vitest suites green; oxfmt clean on every touched file. Co-Authored-By: Claude Sonnet 5 <[email protected]>
rainforwind
pushed a commit
to rainforwind/wikijs
that referenced
this pull request
Aug 30, 2026
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
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.
Fix: #2011
Reproduced the bug on master, and verified the fix