Merge tag 'v4.2.20'

This commit is contained in:
bgme 2025-04-12 22:35:59 +08:00
commit 2fbf224392
62 changed files with 1267 additions and 317 deletions

View file

@ -13,7 +13,7 @@ module Mastodon
end
def patch
15
20
end
def default_prerelease

View file

@ -5,6 +5,10 @@ class Redis
def exists?(...)
call_with_namespace('exists?', ...)
end
def with
yield self
end
end
end

View file

@ -91,19 +91,17 @@ class Sanitize
]
)
MASTODON_OEMBED ||= freeze_config(
elements: %w(audio embed iframe source video),
MASTODON_OEMBED = freeze_config(
elements: %w(audio iframe source video),
attributes: {
'audio' => %w(controls),
'embed' => %w(height src type width),
'iframe' => %w(allowfullscreen frameborder height scrolling src width),
'source' => %w(src type),
'video' => %w(controls height loop width),
},
protocols: {
'embed' => { 'src' => HTTP_PROTOCOLS },
'iframe' => { 'src' => HTTP_PROTOCOLS },
'source' => { 'src' => HTTP_PROTOCOLS },
},