Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif

2017-04-18 01:25:50 +02:00
parent 16d50f60d1 ffb99325ca
commit 57d784f1e4
12 changed files with 65 additions and 28 deletions
--- a/app/assets/javascripts/components/containers/status_container.jsx
+++ b/app/assets/javascripts/components/containers/status_container.jsx
@ -27,7 +27,8 @@ const makeMapStateToProps = () => {
  const mapStateToProps = (state, props) => ({
    status: getStatus(state, props.id),
    me: state.getIn(['meta', 'me']),
-    boostModal: state.getIn(['meta', 'boost_modal'])
+    boostModal: state.getIn(['meta', 'boost_modal']),
+    autoPlayGif: state.getIn(['meta', 'auto_play_gif'])
  });

  return mapStateToProps;