Merge release branch 'release-1.2'

web/react/components/more_direct_channels.jsx

@@ -50,6 +50,10 @@ export default class MoreDirectChannels extends React.Component {
     handleFilterChange() {
         const filter = ReactDOM.findDOMNode(this.refs.filter).value;
 
+        if ($(window).width() > 768) {
+            $(ReactDOM.findDOMNode(this.refs.userList)).scrollTop(0);
+        }
+
         if (filter !== this.state.filter) {
             this.setState({filter});
         }

web/react/components/post_attachment.jsx

@@ -50,7 +50,8 @@ export default class PostAttachment extends React.Component {
     }
 
     shouldCollapse() {
-        return (this.props.attachment.text.match(/\n/g) || []).length >= 5 || this.props.attachment.text.length > 700;
+        const text = this.props.attachment.text || '';
+        return (text.match(/\n/g) || []).length >= 5 || text.length > 700;
     }
 
     getCollapsedText() {
@@ -292,4 +293,4 @@ export default class PostAttachment extends React.Component {
 
 PostAttachment.propTypes = {
     attachment: React.PropTypes.object.isRequired
-};
+};