Merge branch 'main' into glitch-soc/merge-upstream

2021-05-22 13:11:31 +02:00
parent 03952c7d49 92a9fcf0e1
commit 5f334807d2
55 changed files with 646 additions and 418 deletions
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -361,9 +361,9 @@ class UI extends React.PureComponent {
      this.props.dispatch(closeOnboarding());
    }

+    this.props.dispatch(fetchMarkers());
    this.props.dispatch(expandHomeTimeline());
    this.props.dispatch(expandNotifications());
-    setTimeout(() => this.props.dispatch(fetchMarkers()), 500);
    setTimeout(() => this.props.dispatch(fetchFilters()), 500);

    this.hotkeys.__mousetrap__.stopCallback = (e, element) => {