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

2018-11-10 17:57:19 +01:00
parent 09562b0fcc 3cecf3e5b9
commit 0506c6f62f
6 changed files with 44 additions and 24 deletions
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -153,6 +153,7 @@ class Notifications extends React.PureComponent {
        scrollKey={`notifications-${columnId}`}
        trackScroll={!pinned}
        isLoading={isLoading}
+        showLoading={isLoading && notifications.size === 0}
        hasMore={hasMore}
        emptyMessage={emptyMessage}
        onLoadMore={this.handleLoadOlder}