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

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's

diff --cc app/javascript/mastodon/features/compose/components/poll_form.js
index bdccf9ce76d28a350b0b56e6a5c760c36572906d,898f956b0c0f79eb3e7ce9d98ec70b86ca4309dc..923f1029fc03be78820513c6037722c502e70d8e
--- 1/app/javascript/mastodon/features/compose/components/poll_form.js
--- 2/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@@ -142,9 -142,7 +142,7 @@@ class PollForm extends ImmutablePureCom
          </ul>
  
          <div className='poll__footer'>
-           {options.size < 5 && (
-             <button className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
-           )}
 -          <button disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
++          <button disabled={options.size >= 5} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
  
            <select value={expiresIn} onChange={this.handleSelectDuration}>
              <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc package.json
index 581038b9946a3f4cc2d11b666f2e1741f68b62cc,464b002b99da86788d2634c62ee12c6f0fde9f28..70b58a9500db70084e9fac4d5a468757d6a75e1d
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -69,12 -68,11 +69,12 @@@
      "@babel/plugin-transform-react-jsx-self": "^7.2.0",
      "@babel/plugin-transform-react-jsx-source": "^7.5.0",
      "@babel/plugin-transform-runtime": "^7.5.5",
-     "@babel/preset-env": "^7.6.0",
-     "@babel/preset-react": "^7.0.0",
-     "@babel/runtime": "^7.5.4",
+     "@babel/preset-env": "^7.7.1",
+     "@babel/preset-react": "^7.6.3",
+     "@babel/runtime": "^7.7.1",
      "@clusterws/cws": "^0.15.2",
      "array-includes": "^3.0.3",
 +    "atrament": "^0.2.3",
      "arrow-key-navigation": "^1.0.2",
      "autoprefixer": "^9.6.1",
      "axios": "^0.19.0",
@@@ -99,9 -97,8 +99,9 @@@
      "exif-js": "^2.3.0",
      "express": "^4.17.1",
      "file-loader": "^4.2.0",
 +    "favico.js": "^0.3.10",
      "font-awesome": "^4.7.0",
-     "glob": "^7.1.1",
+     "glob": "^7.1.5",
      "history": "^4.10.1",
      "http-link-header": "^1.0.2",
      "immutable": "^3.8.2",

diff --cc yarn.lock
Simple merge