Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added `<s>` to the list of allowed tags, the conflict is because
  we have a different list of allowed tags.
  Added `<s>` like upstream did.
This commit is contained in:
Claire
2024-08-12 17:46:24 +02:00
parent 9edf98c02a b42661ba95
commit 83480df820
20 changed files with 159 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sanitize_ext/sanitize_config.rb
View File

@@ -75,7 +75,7 @@ class Sanitize
end
MASTODON_STRICT = freeze_config(
elements: %w(p br span a abbr del pre blockquote code b strong u sub sup i em h1 h2 h3 h4 h5 ul ol li ruby rt rp),
elements: %w(p br span a abbr del s pre blockquote code b strong u sub sup i em h1 h2 h3 h4 h5 ul ol li ruby rt rp),
attributes: {
'a' => %w(href rel class title translate),