]> cat aescling's git repositories - mastodon.git/commitdiff
Fix wrong redirect from getting started to home in advanced Web UI (#10839)
authorHanage999 <hanage999@crazynewworld.net>
Sun, 26 May 2019 10:22:33 +0000 (19:22 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Sun, 26 May 2019 10:22:33 +0000 (12:22 +0200)
* update Ruby to 2.5.3

* Link to Getting Started will not redirect to Home in multi-column UI (https://github.com/tootsuite/mastodon/pull/10835)

app/javascript/mastodon/features/getting_started/index.js

index bafcc275b02496c011b7e23d3f2ab04284fcefc1..129ce77f62f7694945ea2244491cb589ebfc106d 100644 (file)
@@ -76,9 +76,9 @@ class GettingStarted extends ImmutablePureComponent {
   };
 
   componentDidMount () {
-    const { myAccount, fetchFollowRequests } = this.props;
+    const { myAccount, fetchFollowRequests, multiColumn } = this.props;
 
-    if (window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) {
+    if (!multiColumn && window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) {
       this.context.router.history.replace('/timelines/home');
       return;
     }