aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2019-02-22 15:17:17 +0000
committerShpuld Shpludson <shp@cock.li>2019-02-22 15:17:17 +0000
commit99051f4a55376939a3161c9cdeac5fdb9d99915a (patch)
tree80f3f7d00b337d1369d9bb398fd16e82cff0cd75 /src
parente34e1ccdae06302ee734414267a357ff5b7c888c (diff)
parent1e43a47c3c922c4b68e0a84b74cafe6a2ea23bf1 (diff)
Merge branch 'fix/fetch-error-when-login' into 'develop'
#370 fix/fetch-error-when-login See merge request pleroma/pleroma-fe!596
Diffstat (limited to 'src')
-rw-r--r--src/components/timeline/timeline.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 40226674..25c553cb 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -54,6 +54,8 @@ const Timeline = {
window.addEventListener('scroll', this.scrollLoad)
+ if (this.timelineName === 'friends' && !credentials) { return false }
+
timelineFetcher.fetchAndUpdate({
store,
credentials,