Claire
e202314a75
Merge branch 'master' into glitch-soc/merge-upstream
2021-01-18 13:57:12 +01:00
dependabot[bot]
096347be10
Bump webpack from 4.44.2 to 4.45.0 ( #15535 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.44.2 to 4.45.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.44.2...v4.45.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-17 01:12:22 +09:00
dependabot[bot]
086d1e675a
Bump @rails/ujs from 6.1.0 to 6.1.1 ( #15531 )
...
Bumps [@rails/ujs](https://github.com/rails/rails ) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.0...v6.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-17 01:09:26 +09:00
dependabot[bot]
03c8590b28
Bump @testing-library/react from 11.2.2 to 11.2.3 ( #15533 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 11.2.2 to 11.2.3.
- [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/v11.2.2...v11.2.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-17 01:08:45 +09:00
dependabot[bot]
2d4a550d10
Bump sass from 1.32.0 to 1.32.2 ( #15534 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.32.0 to 1.32.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.32.0...1.32.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-17 01:08:19 +09:00
Claire
33d30632fb
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/public_feed.rb`:
Upstream refactored a bit, glitch-soc had specific code for local-only
statuses.
Updated glitch-soc's specific code accordingly.
2021-01-11 11:55:42 +01:00
dependabot[bot]
58e452beb8
Bump webpack-assets-manifest from 3.1.1 to 4.0.0 ( #15288 )
...
Bumps [webpack-assets-manifest](https://github.com/webdeveric/webpack-assets-manifest ) from 3.1.1 to 4.0.0.
- [Release notes](https://github.com/webdeveric/webpack-assets-manifest/releases )
- [Commits](https://github.com/webdeveric/webpack-assets-manifest/compare/v3.1.1...v4.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-07 14:06:15 +09:00
Claire
90528f43bc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/configuration.js`:
Upstream updated the `js-yaml` dependency, which changed how to call it.
Those changes conflicted because that code is pretty different in glitch-soc
which has to deal with its more complex theming system.
Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
Not really a conflict, just glitch-soc-specific dependencies textually too
close to some dependencies updated upstream.
2021-01-06 18:08:06 +01:00
dependabot[bot]
40dd048ace
Bump js-yaml from 3.14.1 to 4.0.0 ( #15484 )
...
* Bump js-yaml from 3.14.1 to 4.0.0
Bumps [js-yaml](https://github.com/nodeca/js-yaml ) from 3.14.1 to 4.0.0.
- [Release notes](https://github.com/nodeca/js-yaml/releases )
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/nodeca/js-yaml/compare/3.14.1...4.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* Replace deprecated method
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-01-05 02:08:59 +09:00
dependabot[bot]
fcf57c2440
Bump @testing-library/jest-dom from 5.11.6 to 5.11.8 ( #15480 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.11.6 to 5.11.8.
- [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.6...v5.11.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-04 21:04:11 +09:00
dependabot[bot]
3a1ca30252
Bump eslint from 7.16.0 to 7.17.0 ( #15483 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.16.0 to 7.17.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.16.0...v7.17.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-04 21:04:00 +09:00
dependabot[bot]
1817fce074
Bump webpack-dev-server from 3.11.0 to 3.11.1 ( #15481 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.11.1/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.11.0...v3.11.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-04 21:03:32 +09:00
dependabot[bot]
cbb48501c3
Bump eslint-plugin-react from 7.21.5 to 7.22.0 ( #15482 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.21.5 to 7.22.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.21.5...v7.22.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-04 21:02:23 +09:00
dependabot[bot]
9873f7ec27
Bump sass from 1.30.0 to 1.32.0 ( #15486 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.30.0 to 1.32.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.30.0...1.32.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-01-04 21:01:46 +09:00
dependabot[bot]
1aeb7c9933
Bump @rails/ujs from 6.0.3 to 6.1.0 ( #15336 )
...
Bumps [@rails/ujs](https://github.com/rails/rails ) from 6.0.3 to 6.1.0.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.0.3...v6.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 19:19:41 +09:00
dependabot[bot]
6685424873
Bump @babel/preset-env from 7.12.7 to 7.12.11 ( #15394 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.12.7 to 7.12.11.
- [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.12.11/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 19:19:16 +09:00
dependabot[bot]
f23bee4412
Bump @babel/core from 7.12.7 to 7.12.10 ( #15340 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.12.7 to 7.12.10.
- [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.12.10/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 13:08:17 +09:00
dependabot[bot]
92f3b2b65c
Bump webpack-bundle-analyzer from 4.1.0 to 4.3.0 ( #15395 )
...
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer ) from 4.1.0 to 4.3.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/v4.1.0...v4.3.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 12:13:56 +09:00
dependabot[bot]
916e0a3548
Bump object.values from 1.1.1 to 1.1.2 ( #15248 )
...
Bumps [object.values](https://github.com/es-shims/Object.values ) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/es-shims/Object.values/releases )
- [Changelog](https://github.com/es-shims/Object.values/blob/main/CHANGELOG.md )
- [Commits](https://github.com/es-shims/Object.values/compare/v1.1.1...v1.1.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 11:55:58 +09:00
dependabot[bot]
8def8d7fca
Bump @babel/plugin-proposal-decorators from 7.12.1 to 7.12.12 ( #15451 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.12.1 to 7.12.12.
- [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.12.12/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-12-30 11:52:19 +09:00
dependabot[bot]
18d95ba212
Bump is-nan from 1.3.0 to 1.3.2 ( #15455 )
...
Bumps [is-nan](https://github.com/es-shims/is-nan ) from 1.3.0 to 1.3.2.
- [Release notes](https://github.com/es-shims/is-nan/releases )
- [Changelog](https://github.com/es-shims/is-nan/blob/main/CHANGELOG.md )
- [Commits](https://github.com/es-shims/is-nan/compare/v1.3.0...v1.3.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 11:47:18 +09:00
dependabot[bot]
ca5baf0729
Bump axios from 0.21.0 to 0.21.1 ( #15456 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.21.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.21.0...v0.21.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 11:44:25 +09:00
dependabot[bot]
c072c12a7c
Bump eslint from 7.14.0 to 7.16.0 ( #15393 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.14.0 to 7.16.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.14.0...v7.16.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:06:17 +09:00
dependabot[bot]
80120f18b9
Bump react-select from 3.1.0 to 3.1.1 ( #15246 )
...
Bumps [react-select](https://github.com/JedWatson/react-select ) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.1.0...react-select@3.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:05:30 +09:00
dependabot[bot]
d39de20e4f
Bump react-overlays from 0.9.2 to 0.9.3 ( #15392 )
...
Bumps [react-overlays](https://github.com/react-bootstrap/react-overlays ) from 0.9.2 to 0.9.3.
- [Release notes](https://github.com/react-bootstrap/react-overlays/releases )
- [Changelog](https://github.com/react-bootstrap/react-overlays/blob/master/CHANGELOG.md )
- [Commits](https://github.com/react-bootstrap/react-overlays/compare/v0.9.2...v0.9.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:04:48 +09:00
dependabot[bot]
451f4fb87f
Bump color-blend from 3.0.0 to 3.0.1 ( #15343 )
...
Bumps [color-blend](https://github.com/Loilo/color-blend ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/Loilo/color-blend/releases )
- [Commits](https://github.com/Loilo/color-blend/compare/v3.0.0...v3.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:01:25 +09:00
dependabot[bot]
500ca53d7f
Bump sass from 1.29.0 to 1.30.0 ( #15295 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.29.0 to 1.30.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.29.0...1.30.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-30 00:00:47 +09:00
dependabot[bot]
998c28e031
Bump webpack-merge from 5.4.0 to 5.7.3 ( #15452 )
...
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge ) from 5.4.0 to 5.7.3.
- [Release notes](https://github.com/survivejs/webpack-merge/releases )
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.4.0...v5.7.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:56:33 +09:00
dependabot[bot]
5b7abf6a83
Bump intersection-observer from 0.11.0 to 0.12.0 ( #15342 )
...
Bumps [intersection-observer](https://github.com/w3c/IntersectionObserver ) from 0.11.0 to 0.12.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>
2020-12-29 23:51:48 +09:00
dependabot[bot]
b3e0d07f8e
Bump mini-css-extract-plugin from 1.3.1 to 1.3.3 ( #15338 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 1.3.1 to 1.3.3.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.3.1...v1.3.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:50:36 +09:00
dependabot[bot]
c09aa6616e
Bump @babel/plugin-transform-runtime from 7.12.1 to 7.12.10 ( #15334 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.12.1 to 7.12.10.
- [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.12.10/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-12-29 23:47:52 +09:00
dependabot[bot]
bf63840612
Bump js-yaml from 3.14.0 to 3.14.1 ( #15333 )
...
Bumps [js-yaml](https://github.com/nodeca/js-yaml ) from 3.14.0 to 3.14.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases )
- [Changelog](https://github.com/nodeca/js-yaml/blob/3.14.1/CHANGELOG.md )
- [Commits](https://github.com/nodeca/js-yaml/compare/3.14.0...3.14.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:47:26 +09:00
dependabot[bot]
abd84a19e3
Bump @babel/preset-react from 7.12.7 to 7.12.10 ( #15331 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.12.7 to 7.12.10.
- [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.12.10/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-12-29 23:47:08 +09:00
dependabot[bot]
1cb58eb47c
Bump yargs from 16.1.1 to 16.2.0 ( #15293 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 16.1.1 to 16.2.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/v16.1.1...v16.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:43:58 +09:00
dependabot[bot]
057dfeacf4
Bump cross-env from 7.0.2 to 7.0.3 ( #15292 )
...
Bumps [cross-env](https://github.com/kentcdodds/cross-env ) from 7.0.2 to 7.0.3.
- [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/v7.0.2...v7.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:41:30 +09:00
dependabot[bot]
9fe8729c49
Bump babel-loader from 8.2.1 to 8.2.2 ( #15243 )
...
Bumps [babel-loader](https://github.com/babel/babel-loader ) from 8.2.1 to 8.2.2.
- [Release notes](https://github.com/babel/babel-loader/releases )
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel-loader/compare/v8.2.1...v8.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:34:37 +09:00
dependabot[bot]
3932207bd2
Bump array-includes from 3.1.1 to 3.1.2 ( #15240 )
...
Bumps [array-includes](https://github.com/es-shims/array-includes ) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/es-shims/array-includes/releases )
- [Changelog](https://github.com/es-shims/array-includes/blob/main/CHANGELOG.md )
- [Commits](https://github.com/es-shims/array-includes/compare/v3.1.1...v3.1.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:31:58 +09:00
dependabot[bot]
3332dd1de7
Bump detect-passive-events from 2.0.1 to 2.0.2 ( #15237 )
...
Bumps [detect-passive-events](https://github.com/rafgraph/detect-passive-events ) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/rafgraph/detect-passive-events/releases )
- [Commits](https://github.com/rafgraph/detect-passive-events/compare/v2.0.1...v2.0.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-12-29 23:28:30 +09:00
Claire
f8d867bac4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/remove_status_service.rb`:
Conflict caused by us having a distinc Direct timeline.
Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Conflict between glitch-soc's variable character limit and upstream
refactoring that part of the code.
Ported upstream changes.
2020-12-05 17:33:37 +01:00
Eugen Rochko
1e89e2ed98
Change media modals look in web UI ( #15217 )
...
- Change overlay background to match color of viewed image
- Add interactive reply/boost/favourite buttons to footer of modal
- Change ugly "View context" link to button among the action bar
2020-11-27 03:24:11 +01:00
Thibaut Girka
e71b16ae2b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
glitch-soc-only dependency textually too close to updated upstream
dependencies. Updated to upsteam dependencies.
2020-11-25 15:31:45 +01:00
Eugen Rochko
41b38b0273
Revert "Bump webpack-cli from 3.3.12 to 4.2.0 ( #15123 )" ( #15213 )
...
This reverts commit 022d2353a7
.
2020-11-24 21:06:18 +01:00
dependabot[bot]
4ae22c4613
Bump @babel/preset-env from 7.12.1 to 7.12.7 ( #15209 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.12.1 to 7.12.7.
- [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.12.7/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 21:03:44 +09:00
dependabot[bot]
01e41acb9c
Bump eslint from 7.13.0 to 7.14.0 ( #15210 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.13.0 to 7.14.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.13.0...v7.14.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:07:56 +09:00
dependabot[bot]
fef4da9fe0
Bump @babel/preset-react from 7.12.5 to 7.12.7 ( #15208 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.12.5 to 7.12.7.
- [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.12.7/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-11-23 17:05:04 +09:00
dependabot[bot]
3e7016170b
Bump @babel/core from 7.12.3 to 7.12.7 ( #15205 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.12.3 to 7.12.7.
- [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.12.7/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:04:47 +09:00
dependabot[bot]
94c97ef3ae
Bump @testing-library/react from 11.2.0 to 11.2.2 ( #15211 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 11.2.0 to 11.2.2.
- [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/v11.2.0...v11.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-23 17:03:37 +09:00
Thibaut Girka
48f0f3ffee
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
Upstream added the `bug` label to bug reports.
Did the same.
- `app/services/fan_out_on_write_service.rb`:
Upstream put DMs back into timelines, glitch-soc was already doing it.
Ignored upstream changes.
2020-11-20 13:27:48 +01:00
dependabot[bot]
022d2353a7
Bump webpack-cli from 3.3.12 to 4.2.0 ( #15123 )
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.3.12 to 4.2.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.12...webpack-cli@4.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 17:47:20 +01:00
dependabot[bot]
dbe5a96121
Bump @testing-library/react from 11.1.1 to 11.2.0 ( #15186 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 11.1.1 to 11.2.0.
- [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/v11.1.1...v11.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 17:42:47 +01:00