Merge changes from upstream with the CSS reload fix

2017-07-18 18:58:47 +02:00
parent c727eae441 0b4006fc47
commit d69fa9e1f4
98 changed files with 1376 additions and 582 deletions
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -186,6 +186,12 @@ export default class MediaGallery extends React.PureComponent {
    visible: !this.props.sensitive,
  };

+  componentWillReceiveProps (nextProps) {
+    if (nextProps.sensitive !== this.props.sensitive) {
+      this.setState({ visible: !nextProps.sensitive });
+    }
+  }
+
  handleOpen = () => {
    this.setState({ visible: !this.state.visible });
  }