about summary refs log tree commit diff
path: root/app/assets/javascripts/components/features/ui
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-01-24 21:56:06 +0100
committerGitHub <noreply@github.com>2017-01-24 21:56:06 +0100
commitf8da0dd4907490f57cb14b052b767c66c95c4db3 (patch)
tree871a1b902872d22d0c28e96dbc733533d33ac397 /app/assets/javascripts/components/features/ui
parentbf0f6eb62d0f5bd1f0d8e4e2a6e9e8fd3b297b6c (diff)
parent8a880a3d464daf486a10d85b8ee49305aa6b1e5b (diff)
Merge branch 'master' into master
Diffstat (limited to 'app/assets/javascripts/components/features/ui')
-rw-r--r--app/assets/javascripts/components/features/ui/containers/status_list_container.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
index ffb6f6e79..8af7b0c3c 100644
--- a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
+++ b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx
@@ -33,7 +33,8 @@ const getStatusIds = createSelector([
 }));
 
 const mapStateToProps = (state, props) => ({
-  statusIds: getStatusIds(state, props)
+  statusIds: getStatusIds(state, props),
+  isLoading: state.getIn(['timelines', props.type, 'isLoading'], true)
 });
 
 const mapDispatchToProps = (dispatch, { type, id }) => ({