d3f692f7f9
Revert "Remove unused dependency on wavesurfer.js ( #14136 )"
...
This reverts commit 1fcf4d65d5
2020-06-26 13:03:39 +02:00
0e33582bff
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-26 13:02:14 +02:00
7061b5d1da
Remove unnecessary version locks ( #14139 )
2020-06-25 22:41:24 +02:00
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>
2020-06-25 19:01:15 +09:00
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>
2020-06-25 17:24:15 +09:00
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>
2020-06-25 17:19:30 +09:00
1fcf4d65d5
Remove unused dependency on wavesurfer.js ( #14136 )
...
It's not used anymore now that the audio player design has changed again.
2020-06-24 22:54:06 +02:00
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.
2020-06-24 15:33:41 +02:00
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>
2020-06-21 08:30:09 +09:00
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
2020-06-17 17:10:15 +02:00
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>
2020-06-15 23:48:15 +09:00
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>
2020-06-15 23:38:23 +09:00
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>
2020-06-15 23:37:30 +09:00
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>
2020-06-15 23:25:17 +09:00
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.
2020-06-09 10:39:20 +02:00
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>
2020-06-08 15:10:37 +09:00
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>
2020-06-08 01:26:52 +09:00
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>
2020-06-07 02:50:01 +09:00
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>
2020-06-07 02:47:52 +09:00
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>
2020-06-06 08:29:20 +09:00
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>
2020-06-06 07:27:29 +09:00
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>
2020-06-06 06:47:46 +09:00
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>
2020-06-06 06:42:23 +09:00
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>
2020-06-02 05:13:13 +09:00
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>
2020-06-02 04:55:06 +09:00
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>
2020-06-02 04:53:21 +09:00
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>
2020-06-02 04:44:10 +09:00
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>
2020-06-02 04:41:37 +09:00
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>
2020-06-02 04:37:53 +09:00
cb592b80aa
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-29 19:27:21 +02:00
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>
2020-05-28 23:20:20 +09:00
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>
2020-05-28 23:18:32 +09:00
dcb3e180b9
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-28 13:44:57 +02:00
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>
2020-05-28 13:02:34 +02:00
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>
2020-05-28 13:01:41 +02:00
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>
2020-05-28 12:58:58 +02:00
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'.
2020-05-28 12:57:42 +02:00
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>
2020-05-22 00:17:14 +09:00
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>
2020-05-22 00:02:00 +09:00
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>
2020-05-21 23:34:51 +09:00
4853a87df8
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-13 22:11:49 +02:00
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>
2020-05-12 10:00:13 +09:00
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>
2020-05-12 09:20:25 +09:00
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>
2020-05-12 03:29:47 +09:00
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>
2020-05-11 22:51:14 +09:00
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>
2020-05-11 22:50:27 +09:00
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>
2020-05-11 22:21:31 +09:00
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.
2020-05-10 16:19:56 +02:00
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>
2020-05-08 21:35:24 +02:00
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>
2020-05-08 21:32:37 +02:00
Thibaut Girka