about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/account_gallery/components/media_item.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-11-04 14:52:19 +0100
committerGitHub <noreply@github.com>2020-11-04 14:52:19 +0100
commit1f69ad798d9a42d8ec3df69ded7625524c5eb67c (patch)
treea8e0759e3f13bf13dabbb8a261cd1bdb2f3e1e1a /app/javascript/mastodon/features/account_gallery/components/media_item.js
parentb8e790c3c22693271a4fd74ce34067c462ebf8a3 (diff)
parentdc86d814d93b9bb564ab35728c6d9fb65d064ca3 (diff)
Merge pull request #1450 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/features/account_gallery/components/media_item.js')
-rw-r--r--app/javascript/mastodon/features/account_gallery/components/media_item.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.js b/app/javascript/mastodon/features/account_gallery/components/media_item.js
index c9a7af7f7..ba7ec46a3 100644
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.js
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.js
@@ -122,7 +122,7 @@ export default class MediaItem extends ImmutablePureComponent {
         <div className='media-gallery__gifv'>
           {content}
 
-          <span className='media-gallery__gifv__label'>{label}</span>
+          {label && <span className='media-gallery__gifv__label'>{label}</span>}
         </div>
       );
     }