From 4a818ac2deffaff9925ce5b160dbc5385b815a87 Mon Sep 17 00:00:00 2001
From: Hanage999 <hanage999@crazynewworld.net>
Date: Sun, 26 May 2019 19:22:33 +0900
Subject: [PATCH] Fix wrong redirect from getting started to home in advanced
Web UI (#10839)
* 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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index bafcc275b0..129ce77f62 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -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;
}
--
GitLab