Merge remote-tracking branch 'parent/stable-4.3' into upstream-20241005

2024-10-05 09:02:38 +09:00 · 2024-10-05 09:02:38 +09:00 · cc857e57c6
commit cc857e57c6
parent 294acdfd94 6d5aa58f88
132 changed files with 775 additions and 312 deletions
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@ -212,7 +212,7 @@ class Item extends PureComponent {

        {visible && thumbnail}

-        {badges && (
+        {visible && badges && (
          <div className='media-gallery__item__badges'>
            {badges}
          </div>