Merge pull request #3142 from matrix-org/travis/preview-loading

Show a loading state for slow peeks

src/components/structures/RoomView.js

@@ -1523,6 +1523,7 @@ module.exports = React.createClass({
                     <div className="mx_RoomView">
                         <RoomPreviewBar
                             canPreview={false}
+                            previewLoading={this.state.peekLoading}
                             error={this.state.roomLoadError}
                             loading={loading}
                             joining={this.state.joining}