From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 7 Nov 2019 12:43:56 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=83774367d25fd5ad3f9a7b103bea30c13c9e03d8;p=mastodon.git

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
---

83774367d25fd5ad3f9a7b103bea30c13c9e03d8
diff --cc app/javascript/mastodon/features/compose/components/poll_form.js
index bdccf9ce7,898f956b0..923f1029f
--- a/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 package.json
index 581038b99,464b002b9..70b58a950
--- a/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",