bf4e4f3407
Bump sass-loader from 8.0.2 to 9.0.3 ( #14637 )
...
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader ) from 8.0.2 to 9.0.3.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases )
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v8.0.2...v9.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
f86f57ad7e
Bump autoprefixer from 9.8.5 to 9.8.6 ( #14641 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.8.5 to 9.8.6.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.8.5...9.8.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
8b9b24eb72
Bump @babel/runtime from 7.10.5 to 7.11.2 ( #14639 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.10.5 to 7.11.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.11.2/packages/babel-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
2ba22403d2
Bump @babel/plugin-transform-runtime from 7.10.5 to 7.11.0 ( #14645 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.10.5 to 7.11.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.11.0/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
c1710ba63f
Bump babel-jest from 26.1.0 to 26.3.0 ( #14634 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 26.1.0 to 26.3.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.3.0/packages/babel-jest )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
529a7d461b
Bump copy-webpack-plugin from 6.0.2 to 6.0.3 ( #14633 )
...
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin ) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v6.0.2...v6.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
c9616af743
Bump webpack from 4.44.0 to 4.44.1 ( #14628 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.44.0 to 4.44.1.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.44.0...v4.44.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
f142983484
Add WebAuthn as an alternative 2FA method ( #14466 )
...
* feat: add possibility of adding WebAuthn security keys to use as 2FA
This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor
to the Settings page for editing the 2FA methods – now it will list the
methods that are available to the user (TOTP and WebAuthn) and from
there they'll be able to add or remove any of them.
Also, it's worth mentioning that for enabling WebAuthn it's required to
have TOTP enabled, so the first time that you go to the 2FA Settings
page, you'll be asked to set it up.
This work was inspired by the one donde by Github in their platform, and
despite it could be approached in different ways, we decided to go with
this one given that we feel that this gives a great UX.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add request for WebAuthn as second factor at login if enabled
This commits adds the feature for using WebAuthn as a second factor for
login when enabled.
If users have WebAuthn enabled, now a page requesting for the use of a
WebAuthn credential for log in will appear, although a link redirecting
to the old page for logging in using a two-factor code will also be
present.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add possibility of deleting WebAuthn Credentials
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: disable WebAuthn when an Admin disables 2FA for a user
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: remove ability to disable TOTP leaving only WebAuthn as 2FA
Following examples form other platforms like Github, we decided to make
Webauthn 2FA secondary to 2FA with TOTP, so that we removed the
possibility of removing TOTP authentication only, leaving users with
just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA'
in order to remove second factor auth.
The reason for WebAuthn being secondary to TOPT is that in that way,
users will still be able to log in using their code from their phone's
application if they don't have their security keys with them – or maybe
even lost them.
* We had to change a little the flow for setting up TOTP, given that now
it's possible to setting up again if you already had TOTP, in order to
let users modify their authenticator app – given that now it's not
possible for them to disable TOTP and set it up again with another
authenticator app.
So, basically, now instead of storing the new `otp_secret` in the
user, we store it in the session until the process of set up is
finished.
This was because, as it was before, when users clicked on 'Edit' in
the new two-factor methods lists page, but then went back without
finishing the flow, their `otp_secret` had been changed therefore
invalidating their previous authenticator app, making them unable to
log in again using TOTP.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* refactor: fix eslint errors
The PR build was failing given that linting returning some errors.
This commit attempts to fix them.
* refactor: normalize i18n translations
The build was failing given that i18n translations files were not
normalized.
This commits fixes that.
* refactor: avoid having the webauthn gem locked to a specific version
* refactor: use symbols for routes without '/'
* refactor: avoid sending webauthn disabled email when 2FA is disabled
When an admins disable 2FA for users, we were sending two mails
to them, one notifying that 2FA was disabled and the other to notify
that WebAuthn was disabled.
As the second one is redundant since the first email includes it, we can
remove it and send just one email to users.
* refactor: avoid creating new env variable for webauthn_origin config
* refactor: improve flash error messages for webauthn pages
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
4 years ago
759dff28a6
Bump intersection-observer from 0.10.0 to 0.11.0 ( #14589 )
...
Bumps [intersection-observer](https://github.com/w3c/IntersectionObserver ) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/w3c/IntersectionObserver/releases )
- [Commits](https://github.com/w3c/IntersectionObserver/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
aa21664a93
Bump jest from 26.2.2 to 26.4.0 ( #14585 )
...
Bumps [jest](https://github.com/facebook/jest ) from 26.2.2 to 26.4.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v26.2.2...v26.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
f800c99b60
Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
b3e9b0bb25
Bump @babel/core from 7.10.5 to 7.11.1 ( #14554 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.10.5 to 7.11.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.11.1/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
be0475e5a1
Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
60d9c8a475
Bump @testing-library/jest-dom from 5.11.0 to 5.11.2 ( #14497 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.11.0 to 5.11.2.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.0...v5.11.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
0ebfd66d2c
Bump jest from 26.0.1 to 26.2.2 ( #14495 )
...
Bumps [jest](https://github.com/facebook/jest ) from 26.0.1 to 26.2.2.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v26.0.1...v26.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
6636adc0e9
Bump eslint from 7.5.0 to 7.6.0 ( #14508 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.5.0 to 7.6.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.5.0...v7.6.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
7adac64445
Bump @babel/preset-env from 7.10.4 to 7.11.0 ( #14502 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.10.4 to 7.11.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.11.0/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
0afe3c1562
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
No real conflict, just a glitch-soc-only dependency textually too close to
one updated upstream. Ported upstream changes.
4 years ago
565a0c571e
Bump eslint from 6.8.0 to 7.5.0 ( #14454 )
...
* Bump eslint from 6.8.0 to 7.5.0
Bumps [eslint](https://github.com/eslint/eslint ) from 6.8.0 to 7.5.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v6.8.0...v7.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* Fix .codeclimate.yml
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
4 years ago
91ef72990d
Bump webpack from 4.43.0 to 4.44.0 ( #14435 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.43.0 to 4.44.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.43.0...v4.44.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
dc8cabd5ac
Bump @babel/core from 7.10.3 to 7.10.5 ( #14334 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.10.3 to 7.10.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.5/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
c7c6665ba3
Bump yargs from 15.4.0 to 15.4.1 ( #14333 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 15.4.0 to 15.4.1.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
8333848d5c
Bump autoprefixer from 9.8.0 to 9.8.5 ( #14434 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.8.0 to 9.8.5.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.8.0...9.8.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
56fff47531
Bump eslint-plugin-import from 2.21.2 to 2.22.0 ( #14329 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.21.2 to 2.22.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.21.2...v2.22.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
d6d9419239
Bump react-textarea-autosize from 8.1.1 to 8.2.0 ( #14325 )
...
Bumps [react-textarea-autosize](https://github.com/Andarist/react-textarea-autosize ) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/Andarist/react-textarea-autosize/releases )
- [Changelog](https://github.com/Andarist/react-textarea-autosize/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Andarist/react-textarea-autosize/compare/v8.1.1...v8.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
c1cdfe895e
Bump @testing-library/react from 10.4.3 to 10.4.7 ( #14317 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 10.4.3 to 10.4.7.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v10.4.3...v10.4.7 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
912d299e65
Bump sass from 1.26.8 to 1.26.10 ( #14327 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.26.8 to 1.26.10.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.26.8...1.26.10 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
1306e94cab
Bump @babel/plugin-proposal-decorators from 7.10.3 to 7.10.5 ( #14324 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.10.3 to 7.10.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.5/packages/babel-plugin-proposal-decorators )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
4b8d5ad458
Bump @babel/plugin-transform-runtime from 7.10.4 to 7.10.5 ( #14322 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.10.4 to 7.10.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.5/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
7621c25356
Bump react-redux from 7.2.0 to 7.2.1 ( #14408 )
...
Bumps [react-redux](https://github.com/reduxjs/react-redux ) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/reduxjs/react-redux/releases )
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.0...v7.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
d180b17a80
Bump eslint-plugin-react from 7.20.0 to 7.20.4 ( #14422 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.20.0 to 7.20.4.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.20.0...v7.20.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
714a3fcb3b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
Not a “real” conflict, but change too close to a change we made to
fix the vanilla WebUI locally pushing authored local-only toots in the
public TL view.
4 years ago
7cb4344efb
Bump lodash from 4.17.15 to 4.17.19 ( #14321 )
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
67564cbb48
Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
7b50afbfdf
Revert tesseract.js to tesseract.js@2.0.0-alpha.16 ( #14262 )
...
The OCR feature in master is broken, there are several reasons for this:
- https://github.com/naptha/tesseract.js/issues/369
- https://github.com/naptha/tesseract.js/issues/346
- and the fact that the worker JS file is served with an unversioned URL,
and, in the nginx config we provide, served with
"public, max-age=31536000, immutable", leading to version mismatches as
the old version gets cached
4 years ago
c2347f6cf6
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not really a conflict, just some glitch-soc-specific dependency
too close to an upstream-updated one.
4 years ago
cb4e4714c1
Bump babel-jest from 25.2.4 to 26.1.0 ( #14216 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 25.2.4 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/babel-jest )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
a5f8e28ef3
Bump @babel/preset-react from 7.10.1 to 7.10.4 ( #14228 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.10.1 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-preset-react )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
5005e7be3d
Bump @babel/plugin-transform-runtime from 7.10.3 to 7.10.4 ( #14217 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.10.3 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
44f3dc84b1
Bump @babel/plugin-transform-react-inline-elements from 7.10.1 to 7.10.4 ( #14236 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements ) from 7.10.1 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-plugin-transform-react-inline-elements )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
29d078eb69
Bump arrow-key-navigation from 1.1.0 to 1.2.0 ( #14222 )
...
Bumps [arrow-key-navigation](https://github.com/nolanlawson/arrow-key-navigation ) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/nolanlawson/arrow-key-navigation/releases )
- [Commits](https://github.com/nolanlawson/arrow-key-navigation/compare/v1.1.0...v1.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
e2f069e09c
Bump yargs from 15.3.1 to 15.4.0 ( #14234 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 15.3.1 to 15.4.0.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v15.3.1...v15.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
1be04e8679
Bump terser-webpack-plugin from 3.0.3 to 3.0.6 ( #14238 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 3.0.3 to 3.0.6.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v3.0.3...v3.0.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
c8ef2dd4eb
Bump @babel/preset-env from 7.10.2 to 7.10.4 ( #14218 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.10.2 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
05f2993e3b
Revert "Revert "Remove unused dependency on wavesurfer.js ( #14136 )""
...
This reverts commit d3f692f7f9
4 years ago
2a2af880b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream deleted it, I decided to keep it.
- `package.json`:
Upstream updated a dependency textually too close to wavesurfer.js
which has been deleted from upstream but is kept in glitch-soc for now.
4 years ago
a941212907
Bump uuid from 8.1.0 to 8.2.0 ( #14162 )
...
Bumps [uuid](https://github.com/uuidjs/uuid ) from 8.1.0 to 8.2.0.
- [Release notes](https://github.com/uuidjs/uuid/releases )
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md )
- [Commits](https://github.com/uuidjs/uuid/compare/v8.1.0...v8.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
890a6d704a
Bump webpack-cli from 3.3.11 to 3.3.12 ( #14164 )
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.3.11 to 3.3.12.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.12/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.11...v3.3.12 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
a72d95015e
Bump @babel/plugin-transform-runtime from 7.10.1 to 7.10.3 ( #14168 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.10.1 to 7.10.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.3/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
c575d09adc
Bump react-textarea-autosize from 8.0.1 to 8.1.1 ( #14177 )
...
Bumps [react-textarea-autosize](https://github.com/Andarist/react-textarea-autosize ) from 8.0.1 to 8.1.1.
- [Release notes](https://github.com/Andarist/react-textarea-autosize/releases )
- [Changelog](https://github.com/Andarist/react-textarea-autosize/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Andarist/react-textarea-autosize/compare/v8.0.1...v8.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
72ff9a1d65
Replace to testing-library from enzyme ( #14152 )
4 years ago
d3f692f7f9
Revert "Remove unused dependency on wavesurfer.js ( #14136 )"
...
This reverts commit 1fcf4d65d5
4 years ago
0e33582bff
Merge branch 'master' into glitch-soc/merge-upstream
4 years ago
7061b5d1da
Remove unnecessary version locks ( #14139 )
4 years ago
5f79cef474
Bump @babel/plugin-proposal-decorators from 7.8.3 to 7.10.3 ( #14137 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.8.3 to 7.10.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.3/packages/babel-plugin-proposal-decorators )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
9a91ef76ea
Bump eslint-plugin-jsx-a11y from 6.2.3 to 6.3.1 ( #14114 )
...
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y ) from 6.2.3 to 6.3.1.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases )
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md )
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.3...v6.3.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
4dc95e80dc
Bump @babel/core from 7.10.2 to 7.10.3 ( #14112 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.10.2 to 7.10.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.3/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
1fcf4d65d5
Remove unused dependency on wavesurfer.js ( #14136 )
...
It's not used anymore now that the audio player design has changed again.
4 years ago
c1eb60642b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
Conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
Conflict due to glitch-soc's theming system.
Ported upstream changes.
4 years ago
3f187b6260
Bump sass from 1.26.5 to 1.26.8 ( #14078 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.26.5 to 1.26.8.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.26.5...1.26.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
4d5ff62de5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
to a glitch-soc-specific dependency
4 years ago
ffd4d20687
Bump jest from 25.4.0 to 26.0.1 ( #14056 )
...
Bumps [jest](https://github.com/facebook/jest ) from 25.4.0 to 26.0.1.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v25.4.0...v26.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
34703f9cbc
Bump eslint-plugin-import from 2.20.2 to 2.21.2 ( #14054 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.20.2 to 2.21.2.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.20.2...v2.21.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
21212d5625
Bump css-loader from 3.5.3 to 3.6.0 ( #14041 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.5.3 to 3.6.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.5.3...v3.6.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
6e95d08af6
Bump @babel/plugin-transform-react-inline-elements from 7.9.0 to 7.10.1 ( #14048 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements ) from 7.9.0 to 7.10.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.1/packages/babel-plugin-transform-react-inline-elements )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years ago
83dc54c487
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Conflict due to glitch-soc having to take care of local-only
pinned toots in that controller.
Took upstream's changes and restored the local-only special
handling.
- `app/controllers/auth/sessions_controller.rb`:
Minor conflicts due to the theming system, applied upstream
changes, adapted the following two files for glitch-soc's
theming system:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`
- `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
Minor conflict due to glitch-soc having to handle local-only
toots specially. Applied upstream changes and restored
the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
Minor conflict due to the theming system.
- `package.json`:
Upstream dependency updated, too close to a glitch-soc-only
dependency in the file.
- `yarn.lock`:
Upstream dependency updated, too close to a glitch-soc-only
dependency in the file.
5 years ago
2c86a6b395
Bump react-immutable-pure-component from 1.2.3 to 2.2.2 ( #14010 )
...
Bumps [react-immutable-pure-component](https://github.com/Monar/react-immutable-pure-component ) from 1.2.3 to 2.2.2.
- [Release notes](https://github.com/Monar/react-immutable-pure-component/releases )
- [Commits](https://github.com/Monar/react-immutable-pure-component/compare/v1.2.3...v2.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years ago
a9c0ae032d
Bump @babel/plugin-transform-runtime from 7.9.0 to 7.10.1 ( #14003 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.9.0 to 7.10.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.1/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years ago
b792562411
Bump copy-webpack-plugin from 6.0.1 to 6.0.2 ( #13999 )
...
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin ) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v6.0.1...v6.0.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years ago
2655b49d50
Bump @babel/preset-react from 7.9.4 to 7.10.1 ( #13995 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.9.4 to 7.10.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.1/packages/babel-preset-react )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years ago
e038c90dde
Bump babel-eslint from 10.0.3 to 10.1.0 ( #13983 )
...
Bumps [babel-eslint](https://github.com/babel/babel-eslint ) from 10.0.3 to 10.1.0.
- [Release notes](https://github.com/babel/babel-eslint/releases )
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.3...v10.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years ago
4e4e4102f2
Bump terser-webpack-plugin from 3.0.1 to 3.0.3 ( #13978 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 3.0.1 to 3.0.3.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v3.0.1...v3.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years ago
7156b91ad6
Bump @babel/core from 7.9.6 to 7.10.2 ( #13962 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.9.6 to 7.10.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.2/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
5 years ago
2773ea63fa
Bump copy-webpack-plugin from 5.1.1 to 6.0.1 ( #13861 )
...
* Bump copy-webpack-plugin from 5.1.1 to 6.0.1
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin ) from 5.1.1 to 6.0.1.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v5.1.1...v6.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Fix new syntax for copy-webpack-plugin
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
5 years ago
373a6467c5
Bump react-textarea-autosize from 7.1.2 to 8.0.1 ( #13901 )
...
Bumps [react-textarea-autosize](https://github.com/Andarist/react-textarea-autosize ) from 7.1.2 to 8.0.1.
- [Release notes](https://github.com/Andarist/react-textarea-autosize/releases )
- [Changelog](https://github.com/Andarist/react-textarea-autosize/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Andarist/react-textarea-autosize/compare/v7.1.2...react-textarea-autosize@8.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
3740eddcf9
Bump autoprefixer from 9.7.6 to 9.8.0 ( #13903 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.7.6 to 9.8.0.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.6...9.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
0daa00ab51
Bump file-loader from 5.1.0 to 6.0.0 ( #13899 )
...
Bumps [file-loader](https://github.com/webpack-contrib/file-loader ) from 5.1.0 to 6.0.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases )
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v5.1.0...v6.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
8d23ef44ed
Bump webpack-bundle-analyzer from 3.7.0 to 3.8.0 ( #13909 )
...
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer ) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases )
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.7.0...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
628f721b41
Bump eslint-plugin-react from 7.19.0 to 7.20.0 ( #13906 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.19.0 to 7.20.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.19.0...v7.20.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
865baecccf
Bump @babel/preset-env from 7.9.6 to 7.10.2 ( #13920 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.9.6 to 7.10.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.2/packages/babel-preset-env )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
cb592b80aa
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
3dd2538094
Bump compression-webpack-plugin from 3.1.0 to 4.0.0 ( #13863 )
...
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin ) from 3.1.0 to 4.0.0.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v3.1.0...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
a62a95d85e
Bump tesseract.js from 2.0.0-alpha.16 to 2.1.1 ( #13859 )
...
Bumps [tesseract.js](https://github.com/naptha/tesseract.js ) from 2.0.0-alpha.16 to 2.1.1.
- [Release notes](https://github.com/naptha/tesseract.js/releases )
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.16...v2.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
dcb3e180b9
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
03d63c9d58
Bump sass from 1.26.3 to 1.26.5 ( #13855 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.26.3 to 1.26.5.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.26.3...1.26.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
4eca5c33c6
Bump css-loader from 3.4.2 to 3.5.3 ( #13853 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.4.2 to 3.5.3.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.2...v3.5.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
7ff35296c0
Bump uuid from 8.0.0 to 8.1.0 ( #13867 )
...
Bumps [uuid](https://github.com/uuidjs/uuid ) from 8.0.0 to 8.1.0.
- [Release notes](https://github.com/uuidjs/uuid/releases )
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md )
- [Commits](https://github.com/uuidjs/uuid/compare/v8.0.0...v8.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
e9722e340e
Bump wicg-inert to 3.0.3 ( #13878 )
...
Not sure why dependabot hasn't made a PR for this yet, but there is a new
version of wicg-inert, which does not try to dynamically insert styles
anymore when those styles already exist. This will get rid of some of the
CSP violation warnings we get since getting rid of 'unsafe-inline'.
5 years ago
af25fc6c66
Bump eslint-plugin-import from 2.20.1 to 2.20.2 ( #13810 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.20.1 to 2.20.2.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.20.1...v2.20.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
cf65167c4c
Bump intersection-observer from 0.7.0 to 0.10.0 ( #13782 )
...
Bumps [intersection-observer](https://github.com/w3c/IntersectionObserver ) from 0.7.0 to 0.10.0.
- [Release notes](https://github.com/w3c/IntersectionObserver/releases )
- [Commits](https://github.com/w3c/IntersectionObserver/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
ac41defb8b
Bump webpack-dev-server from 3.10.3 to 3.11.0 ( #13795 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.10.3 to 3.11.0.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.10.3...v3.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
4853a87df8
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
0433f2e19c
Bump terser-webpack-plugin from 2.3.5 to 3.0.1 ( #13716 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 2.3.5 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v2.3.5...v3.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
cf1bbc8893
Bump webpack from 4.42.1 to 4.43.0 ( #13717 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.42.1 to 4.43.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.42.1...v4.43.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
3c8b842087
Bump @rails/ujs from 6.0.2 to 6.0.3 ( #13730 )
...
Bumps [@rails/ujs](https://github.com/rails/rails ) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.0.2...v6.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
3eb4af5033
Bump react-dom from 16.13.0 to 16.13.1 ( #13711 )
...
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom ) from 16.13.0 to 16.13.1.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react-dom )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
e545d66ab7
Bump @clusterws/cws from 0.17.3 to 2.0.0 ( #13709 )
...
Bumps [@clusterws/cws](https://github.com/ClusterWS/cWS ) from 0.17.3 to 2.0.0.
- [Release notes](https://github.com/ClusterWS/cWS/releases )
- [Changelog](https://github.com/ClusterWS/cWS/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ClusterWS/cWS/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
c30d50af78
Bump react-test-renderer from 16.13.0 to 16.13.1 ( #13710 )
...
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer ) from 16.13.0 to 16.13.1.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react-test-renderer )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
4e4e5316c1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, just a glitch-soc-only dependency too close to a
dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
Not a real conflict, just a change too close to glitch-soc-changed code
for optionally showing boosts in public timelines.
Applied upstream changes.
- `app/views/layouts/application.html.haml`:
Upstream a new, static CSS file, conflict due to glitch-soc's theming
system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
both files are very different. Removed 'unsafe-inline' as well.
5 years ago
d20884e426
Bump uuid from 7.0.3 to 8.0.0 ( #13665 )
...
Bumps [uuid](https://github.com/uuidjs/uuid ) from 7.0.3 to 8.0.0.
- [Release notes](https://github.com/uuidjs/uuid/releases )
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md )
- [Commits](https://github.com/uuidjs/uuid/compare/v7.0.3...v8.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
f0a4b6bd01
Bump babel-plugin-react-intl from 3.4.1 to 6.2.0 ( #13648 )
...
Bumps [babel-plugin-react-intl](https://github.com/formatjs/formatjs ) from 3.4.1 to 6.2.0.
- [Release notes](https://github.com/formatjs/formatjs/releases )
- [Commits](https://github.com/formatjs/formatjs/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
363ae4c601
Bump @babel/preset-env from 7.9.0 to 7.9.6 ( #13637 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.9.0 to 7.9.6.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.9.0...v7.9.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
49b74dcf72
Bump @babel/core from 7.9.0 to 7.9.6 ( #13604 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.9.0 to 7.9.6.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.9.0...v7.9.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
88b227b1d8
Bump webpack-bundle-analyzer from 3.6.1 to 3.7.0 ( #13607 )
...
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer ) from 3.6.1 to 3.7.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases )
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.6.1...v3.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
7e22d676e4
Bump wavesurfer.js from 3.3.1 to 3.3.3 ( #13605 )
...
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js ) from 3.3.1 to 3.3.3.
- [Release notes](https://github.com/katspaugh/wavesurfer.js/releases )
- [Changelog](https://github.com/katspaugh/wavesurfer.js/blob/master/CHANGES.md )
- [Commits](https://github.com/katspaugh/wavesurfer.js/compare/3.3.1...3.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
6442f25964
Bump jest from 24.9.0 to 25.4.0 ( #13517 )
...
Bumps [jest](https://github.com/facebook/jest ) from 24.9.0 to 25.4.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v24.9.0...v25.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
2ac1f38bd8
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
1deabd9c0e
Bump uuid from 7.0.2 to 7.0.3 ( #13520 )
...
Bumps [uuid](https://github.com/uuidjs/uuid ) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/uuidjs/uuid/releases )
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md )
- [Commits](https://github.com/uuidjs/uuid/compare/v7.0.2...v7.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
f9d5864e04
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
No real conflict, upstream updated a dependency which is
textually adjacent to a glitch-soc-specific dependency.
Updated it.
- `yarn.lock`:
No real conflict, upstream updated a dependency which is
textually adjacent to a glitch-soc-specific dependency.
Updated it.
5 years ago
c734222726
Bump mkdirp from 1.0.3 to 1.0.4 ( #13463 )
...
Bumps [mkdirp](https://github.com/isaacs/node-mkdirp ) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases )
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md )
- [Commits](https://github.com/isaacs/node-mkdirp/compare/v1.0.3...v1.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
c10c518e04
Bump autoprefixer from 9.7.5 to 9.7.6 ( #13467 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.7.5 to 9.7.6.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.5...9.7.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
c13682bc0d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Upstream modified code that we split between multiple files due
to glitch-soc's theming system.
Ported those changes.
5 years ago
aa18f4e7d1
Bump rails from 5.2.4.1 to 5.2.4.2 and kind-of from 6.0.2 to 6.0.3 ( #13387 )
...
* Bump rails from 5.2.4.1 to 5.2.4.2
* Bump kind-of from 6.0.2 to 6.0.3
5 years ago
631dacf1d7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
Upstream bumped poll option character limit, but we already had
a higher one, kept ours.
- `app/validators/poll_validator.rb`:
Upstream bumped poll option character limit, but we already had
a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
Upstream added a rule, the way we compute ours is different, but
that added rule has been ported.
- `package.json`:
No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
No real conflict, dependency update. Performed the same update.
5 years ago
241916b0dd
Bump autoprefixer from 9.7.4 to 9.7.5 ( #13338 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.7.4 to 9.7.5.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.4...9.7.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
77a0c79427
Bump @babel/preset-react from 7.8.3 to 7.9.4 ( #13335 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel ) from 7.8.3 to 7.9.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
7f0d2f4cc7
Bump babel-loader from 8.0.6 to 8.1.0 ( #13333 )
...
Bumps [babel-loader](https://github.com/babel/babel-loader ) from 8.0.6 to 8.1.0.
- [Release notes](https://github.com/babel/babel-loader/releases )
- [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel-loader/compare/v8.0.6...v8.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
9f4d4b46e7
Bump yargs from 15.1.0 to 15.3.1 ( #13334 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 15.1.0 to 15.3.1.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v15.1.0...v15.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
0c725a074b
Bump @babel/preset-env from 7.8.3 to 7.9.0 ( #13336 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
8091b8d433
Bump babel-jest from 25.1.0 to 25.2.4 ( #13332 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 25.1.0 to 25.2.4.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v25.2.4/packages/babel-jest )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
fa494a085c
Bump stringz from 2.0.0 to 2.1.0 ( #13331 )
...
Bumps [stringz](https://github.com/sallar/stringz ) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/sallar/stringz/releases )
- [Changelog](https://github.com/sallar/stringz/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sallar/stringz/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
b0915c7c49
Bump react from 16.12.0 to 16.13.1 ( #13337 )
...
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react ) from 16.12.0 to 16.13.1.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.13.1/packages/react )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
ee400d1c6c
Bump uuid from 3.4.0 to 7.0.2 ( #13295 )
...
Bumps [uuid](https://github.com/uuidjs/uuid ) from 3.4.0 to 7.0.2.
- [Release notes](https://github.com/uuidjs/uuid/releases )
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md )
- [Commits](https://github.com/uuidjs/uuid/compare/v3.4.0...v7.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
3788f37c30
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
CW/sensitive logic fixed upstream, but different in glitch-soc.
Ported the changes accordingly.
5 years ago
e4a6343e62
Bump webpack from 4.41.5 to 4.42.1 ( #13319 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.41.5 to 4.42.1.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.41.5...v4.42.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
5aa993edc3
Bump @babel/plugin-transform-runtime from 7.8.3 to 7.9.0 ( #13301 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel ) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
55b0babc90
Bump react-select from 3.0.8 to 3.1.0 ( #13296 )
...
Bumps [react-select](https://github.com/JedWatson/react-select ) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js )
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.0.8...react-select@3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
7074d7f58e
Bump webpack-bundle-analyzer from 3.6.0 to 3.6.1 ( #13300 )
...
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer ) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases )
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v3.6.0...v3.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
b6945cfcad
Bump @babel/core from 7.8.6 to 7.9.0 ( #13303 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.8.6 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
37276eb1e8
Bump @babel/plugin-transform-react-inline-elements from 7.8.3 to 7.9.0 ( #13298 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel ) from 7.8.3 to 7.9.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
3b7ef46b11
Bump babel-plugin-preval from 4.0.0 to 5.0.0 ( #13297 )
...
Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval ) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases )
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v4.0.0...v5.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
99fc46d023
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
Updating rails-ujs, no real conflict, but a comment to close to changed
code. Various glitch-soc-only files have been updated to match those changes,
though.
- `package.json`:
No real conflict, just an additional dependency in glitch-soc that was too
close to something updated upstream. Took upstream's changes.
5 years ago
056f97744a
Migrate Rails ujs as required for Rails 6 Upgrade. ( #13280 )
...
* Update yarn.lock
* Update package.json
* Update public.js
* Update admin.js
* Update log_out.js
* Update common.js
5 years ago
a645e78bfa
Bump redis from 2.8.0 to 3.0.2 ( #13102 )
...
Bumps [redis](https://github.com/NodeRedis/node-redis ) from 2.8.0 to 3.0.2.
- [Release notes](https://github.com/NodeRedis/node-redis/releases )
- [Changelog](https://github.com/NodeRedis/node-redis/blob/master/CHANGELOG.md )
- [Commits](https://github.com/NodeRedis/node-redis/compare/v.2.8.0...v3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
296054d175
Bump mkdirp from 0.5.1 to 1.0.3 ( #12979 )
...
Bumps [mkdirp](https://github.com/isaacs/node-mkdirp ) from 0.5.1 to 1.0.3.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases )
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md )
- [Commits](https://github.com/isaacs/node-mkdirp/commits/v1.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
615b783232
Bump sass from 1.25.0 to 1.26.3 ( #13263 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.25.0 to 1.26.3.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.25.0...1.26.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
0acd29ea2f
Bump react-test-renderer from 16.12.0 to 16.13.0 ( #13260 )
...
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer ) from 16.12.0 to 16.13.0.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.13.0/packages/react-test-renderer )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
ff03adfb9f
Bump react-dom from 16.12.0 to 16.13.0 ( #13181 )
...
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom ) from 16.12.0 to 16.13.0.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.13.0/packages/react-dom )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
ebd319b739
Bump babel-jest from 24.9.0 to 25.1.0 ( #12973 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 24.9.0 to 25.1.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v25.1.0/packages/babel-jest )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
407376af9b
Bump react-immutable-proptypes from 2.1.0 to 2.2.0 ( #13259 )
...
Bumps [react-immutable-proptypes](https://github.com/HurricaneJames/react-immutable-proptypes ) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/HurricaneJames/react-immutable-proptypes/releases )
- [Changelog](https://github.com/HurricaneJames/react-immutable-proptypes/blob/master/CHANGELOG.md )
- [Commits](https://github.com/HurricaneJames/react-immutable-proptypes/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
670d0be32b
Bump eslint-plugin-react from 7.17.0 to 7.19.0 ( #13224 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.17.0 to 7.19.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.17.0...v7.19.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
b3bf5aa8e0
Bump cross-env from 6.0.3 to 7.0.2 ( #13228 )
...
Bumps [cross-env](https://github.com/kentcdodds/cross-env ) from 6.0.3 to 7.0.2.
- [Release notes](https://github.com/kentcdodds/cross-env/releases )
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
fb697be727
Bump wicg-inert from 3.0.0 to 3.0.2 ( #13226 )
...
Bumps [wicg-inert](https://github.com/WICG/inert ) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/WICG/inert/releases )
- [Commits](https://github.com/WICG/inert/compare/v3.0.0...v3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
6ed086161e
Bump file-loader from 5.0.2 to 5.1.0 ( #13225 )
...
Bumps [file-loader](https://github.com/webpack-contrib/file-loader ) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases )
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v5.0.2...v5.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago
0fd3f87ea2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Conflict due to upstream adding a new parameter (with_rate_limit),
too close to glitch-soc's own additional parameter (content_type).
Added upstream's parameter.
- `app/services/post_status_service.rb`:
Conflict due to upstream adding a new parameter (rate_limit),
too close to glitch-soc's own additional parameter (content_type).
Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to us not exposing theme settings here (as we have
a different flavour/skin menu).
Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
Coding style fixes for a part we have rewritten.
Discarded upstream changes.
5 years ago
b4a1b1ac61
Bump @babel/runtime from 7.8.3 to 7.8.4 ( #13183 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.8.3 to 7.8.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.8.4/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4655d06d86
Bump webpack-dev-server from 3.10.1 to 3.10.3 ( #13184 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.10.1 to 3.10.3.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.10.1...v3.10.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
5b635f3f81
Bump @babel/core from 7.8.4 to 7.8.6 ( #13185 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.8.4 to 7.8.6.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.4...v7.8.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dc6ab009c0
Update JS dependencies
5 years ago
ea391ce8a1
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
e9d019ef3d
Bump react-redux from 7.1.3 to 7.2.0 ( #13141 )
...
Bumps [react-redux](https://github.com/reduxjs/react-redux ) from 7.1.3 to 7.2.0.
- [Release notes](https://github.com/reduxjs/react-redux/releases )
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.1.3...v7.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
13fe4fcab6
Bump webpack-cli from 3.3.10 to 3.3.11 ( #13139 )
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.3.10 to 3.3.11.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/next/CHANGELOG_v3.md )
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.10...v3.3.11 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
604438587d
Bump rellax from 1.10.0 to 1.12.1 ( #13140 )
...
Bumps [rellax](https://github.com/dixonandmoe/rellax ) from 1.10.0 to 1.12.1.
- [Release notes](https://github.com/dixonandmoe/rellax/releases )
- [Commits](https://github.com/dixonandmoe/rellax/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4b49f08506
Bump @babel/core from 7.8.3 to 7.8.4 ( #13137 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.8.3 to 7.8.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.3...v7.8.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
8e8cce20c7
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
729fe5bfd6
Add source-mapped stacktrace to error message in web UI ( #13082 )
...
* Add source-mapped stack trace to copyable text in error boundary
* Add the error message to the copied report, not only the stack trace
5 years ago
3cdaa34783
Fix old browsers crashing because of missing `finally` polyfill in web UI ( #13115 )
...
Fix #13015
5 years ago
a02bee425b
Bump rimraf from 3.0.0 to 3.0.2 ( #13104 )
...
Bumps [rimraf](https://github.com/isaacs/rimraf ) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/isaacs/rimraf/releases )
- [Changelog](https://github.com/isaacs/rimraf/blob/master/CHANGELOG.md )
- [Commits](https://github.com/isaacs/rimraf/compare/v3.0.0...v3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
a799d849ac
Bump react-swipeable-views from 0.13.4 to 0.13.9 ( #13103 )
...
Bumps [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views ) from 0.13.4 to 0.13.9.
- [Release notes](https://github.com/oliviertassinari/react-swipeable-views/releases )
- [Changelog](https://github.com/oliviertassinari/react-swipeable-views/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oliviertassinari/react-swipeable-views/commits/v0.13.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
99cf292bec
Bump eslint-plugin-import from 2.20.0 to 2.20.1 ( #13101 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.20.0 to 2.20.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.20.0...v2.20.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
4ee8fbcfab
Bump terser-webpack-plugin from 2.3.2 to 2.3.5 ( #13100 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 2.3.2 to 2.3.5.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v2.3.2...v2.3.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
00ac179f00
Bump @babel/plugin-transform-runtime from 7.7.6 to 7.8.3 ( #12980 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel ) from 7.7.6 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.6...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
d354956686
Bump uuid from 3.3.3 to 3.4.0 ( #12981 )
...
Bumps [uuid](https://github.com/uuidjs/uuid ) from 3.3.3 to 3.4.0.
- [Release notes](https://github.com/uuidjs/uuid/releases )
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md )
- [Commits](https://github.com/uuidjs/uuid/compare/v3.3.3...v3.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
cce37a15c0
Bump sass from 1.24.2 to 1.25.0 ( #12978 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.24.2 to 1.25.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.24.2...1.25.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
8062d12b1e
Bump axios from 0.19.1 to 0.19.2 ( #12976 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.19.1 to 0.19.2.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/0.19.1...v0.19.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
af17c6d7f8
Bump @babel/plugin-transform-react-inline-elements from 7.8.0 to 7.8.3 ( #12974 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel ) from 7.8.0 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.0...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
6719b9daa5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.js`:
Upstream removed an unused function in code that has
been refactored a bit. Removed that function in the corresponding
places.
5 years ago
97e6f62138
Bump @babel/core from 7.7.7 to 7.8.3 ( #12893 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.7.7 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.7...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
f48e15284c
Bump @babel/plugin-proposal-decorators from 7.8.0 to 7.8.3 ( #12895 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel ) from 7.8.0 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.8.0...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
1f7e7594db
Merge branch 'master' into glitch-soc/master
...
Conflicts:
- `README.md`:
We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
Conflict due to glitch-soc theming system.
Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
Conflict due to glitch-soc theming system.
Adapted upstream changes.
- `yarn.lock`:
No real conflict, glitch-specific dependency too close to
an updated one. Adapted upstream change.
5 years ago
be1c194c17
Bump react-swipeable-views from 0.13.3 to 0.13.4 ( #12894 )
...
Bumps [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views ) from 0.13.3 to 0.13.4.
- [Release notes](https://github.com/oliviertassinari/react-swipeable-views/releases )
- [Changelog](https://github.com/oliviertassinari/react-swipeable-views/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oliviertassinari/react-swipeable-views/compare/v0.13.3...v0.13.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
9ee0f621d8
Bump @babel/runtime from 7.8.0 to 7.8.3 ( #12892 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.8.0 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.8.3/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
c949d371e2
Bump @babel/plugin-proposal-class-properties from 7.7.4 to 7.8.3 ( #12891 )
...
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel ) from 7.7.4 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
29c805fa65
Bump autoprefixer from 9.7.3 to 9.7.4 ( #12890 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.7.3 to 9.7.4.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.3...9.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
89f8d0d62d
Bump wavesurfer.js from 3.3.0 to 3.3.1 ( #12889 )
...
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js ) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/katspaugh/wavesurfer.js/releases )
- [Changelog](https://github.com/katspaugh/wavesurfer.js/blob/master/CHANGES.md )
- [Commits](https://github.com/katspaugh/wavesurfer.js/compare/3.3.0...3.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
c4d22c1ea8
Bump eslint-plugin-import from 2.19.1 to 2.20.0 ( #12888 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.19.1 to 2.20.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.19.1...v2.20.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
5699d14db5
Bump compression-webpack-plugin from 3.0.1 to 3.1.0 ( #12896 )
...
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin ) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v3.0.1...v3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
80d9faafeb
Bump @babel/preset-react from 7.7.4 to 7.8.3 ( #12865 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel ) from 7.7.4 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
10fb866652
Bump @babel/preset-env from 7.7.7 to 7.8.3 ( #12866 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.7.7 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.7...v7.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
b162186014
Bump @babel/plugin-transform-react-inline-elements from 7.7.4 to 7.8.0 ( #12848 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel ) from 7.7.4 to 7.8.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e7a936d7e3
Bump axios from 0.19.0 to 0.19.1 ( #12846 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.19.0 to 0.19.1.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.19.0...0.19.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
b21d405128
Bump @babel/runtime from 7.7.7 to 7.8.0 ( #12847 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.7.7 to 7.8.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.8.0/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7e8866d8f6
Bump css-loader from 3.4.1 to 3.4.2 ( #12842 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.1...v3.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
740bb6a85e
Bump @babel/plugin-proposal-decorators from 7.7.4 to 7.8.0 ( #12844 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel ) from 7.7.4 to 7.8.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ed4d659dc7
Bump terser-webpack-plugin from 2.3.1 to 2.3.2 ( #12839 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v2.3.1...v2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
27c34a6128
Bump sass-loader from 8.0.0 to 8.0.2 ( #12860 )
...
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader ) from 8.0.0 to 8.0.2.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases )
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v8.0.0...v8.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
82e197787f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
No real conflict, glitch-soc-only dependency (redcarpet) too close to an
upstream one (rdf-normalize)
- `README.md`:
we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
Upstream added code to keep bookmarked statuses, we were already doing so
with slightly different code. Discarded upstream's changes.
- `package.json`:
No real conflict, glitch-soc-only dependency (favico.js) too close to
an upstream one
5 years ago
19025b4c60
Bump file-loader from 4.2.0 to 5.0.2 ( #12521 )
...
Bumps [file-loader](https://github.com/webpack-contrib/file-loader ) from 4.2.0 to 5.0.2.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases )
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v4.2.0...v5.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
1d3f85f036
Require nodejs 10.13 as minimum release. ( #12791 )
...
* Update package.json
* Update README.md
5 years ago
ffe8104398
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
8fe92642da
Bump sass from 1.24.0 to 1.24.2 ( #12778 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.24.0 to 1.24.2.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.24.0...1.24.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
f48825875d
Bump wavesurfer.js from 3.2.0 to 3.3.0 ( #12775 )
...
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js ) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/katspaugh/wavesurfer.js/releases )
- [Changelog](https://github.com/katspaugh/wavesurfer.js/blob/master/CHANGES.md )
- [Commits](https://github.com/katspaugh/wavesurfer.js/compare/3.2.0...3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
9bd4354622
Bump @clusterws/cws from 0.16.1 to 0.17.3 ( #12776 )
...
Bumps @clusterws/cws from 0.16.1 to 0.17.3.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
a99a6746bc
Bump webpack-dev-server from 3.9.0 to 3.10.1 ( #12773 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.9.0 to 3.10.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.10.1/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.9.0...v3.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
370e1218d8
Bump enzyme-adapter-react-16 from 1.15.1 to 1.15.2 ( #12777 )
...
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16 ) from 1.15.1 to 1.15.2.
- [Release notes](https://github.com/airbnb/enzyme/releases )
- [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md )
- [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.15.2/packages/enzyme-adapter-react-16 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
99c52abd41
Bump yargs from 15.0.2 to 15.1.0 ( #12771 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 15.0.2 to 15.1.0.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v15.0.2...v15.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
9c6806fe1a
Bump css-loader from 3.4.0 to 3.4.1 ( #12772 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.0...v3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
2591cedcad
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
Conflict due to theming system.
5 years ago
d0c5a63daf
fix unresolved external in @clusterws/cws by upgrading it ( #12752 )
5 years ago
45e56f8f78
Bump webpack from 4.41.2 to 4.41.5 ( #12724 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.41.2 to 4.41.5.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.41.2...v4.41.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot[bot]
santiagorodriguez96
Thibaut Girka
Yamagishi Kazutoshi
dependabot-preview[bot]
Eugen Rochko
Shlee
Bastien Durel