7b435fd9bf
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.
2020-03-27 21:54:44 +01:00
d88480da4a
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>
2020-03-26 12:45:12 +09:00
cb5ad2bd6d
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>
2020-03-26 12:44:47 +09:00
5020c04e39
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>
2020-03-26 09:57:34 +09:00
e187537dfd
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>
2020-03-26 09:56:14 +09:00
29981c4950
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>
2020-03-26 09:55:32 +09:00
284f51e1cf
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>
2020-03-26 09:54:46 +09:00
b3156d0dac
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>
2020-03-26 09:53:31 +09:00
9abb227250
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.
2020-03-22 16:10:44 +01:00
221eda646b
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
2020-03-21 03:14:50 +01:00
e65996f92b
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>
2020-03-18 19:55:31 +09:00
ce228a440e
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>
2020-03-18 19:45:37 +09:00
6c1e452d20
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>
2020-03-18 19:44:21 +09:00
44cdc330ab
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>
2020-03-18 19:43:22 +09:00
83f193361f
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>
2020-03-18 19:42:04 +09:00
a4387aceab
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>
2020-03-18 19:41:38 +09:00
6dfc161ada
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>
2020-03-18 19:40:49 +09:00
57d98b20f2
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>
2020-03-09 22:33:58 +09:00
116938fc17
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>
2020-03-09 22:28:25 +09:00
2c18debcd5
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>
2020-03-09 22:27:25 +09:00
8c3ac755f0
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>
2020-03-09 22:25:22 +09:00
c790ecb14d
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.
2020-03-08 19:38:53 +01:00
86c932f79c
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>
2020-03-02 21:55:52 +09:00
3d8a6dc043
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>
2020-03-02 21:55:32 +09:00
131c16f0bc
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>
2020-03-02 21:49:40 +09:00
553a16c6f8
Update JS dependencies
2020-02-29 22:32:33 +01:00
85933bc9ff
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-25 14:28:13 +01:00
5158dbeb25
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>
2020-02-24 21:54:19 +09:00
1452d85dd2
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>
2020-02-24 17:50:25 +09:00
6518ee6c43
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>
2020-02-24 17:50:18 +09:00
3d9e9ca375
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>
2020-02-24 17:36:32 +09:00
e037002401
Merge branch 'master' into glitch-soc/merge-upstream
2020-02-19 23:04:18 +01:00
ff3a11d01d
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
2020-02-19 22:36:52 +01:00
1314bba68a
Fix old browsers crashing because of missing `finally` polyfill in web UI ( #13115 )
...
Fix #13015
2020-02-18 17:22:44 +01:00
eadd26f3aa
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>
2020-02-18 01:58:14 +09:00
9547417353
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>
2020-02-18 01:57:29 +09:00
e724541661
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>
2020-02-18 01:53:02 +09:00
6c66985302
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>
2020-02-18 01:49:21 +09:00
346773829a
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>
2020-02-10 21:34:03 +09:00
cc28f7d12c
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>
2020-02-10 20:41:58 +09:00
6d2dc2a8cf
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>
2020-02-10 20:40:32 +09:00
1bd69a256a
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>
2020-02-10 20:30:40 +09:00
acb233b243
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>
2020-02-10 20:29:15 +09:00
dc2ab6e646
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.
2020-01-20 18:31:11 +01:00
39f2bce231
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>
2020-01-21 00:14:06 +09:00
204dd7fd22
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>
2020-01-20 23:15:59 +09:00
45709d6987
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.
2020-01-20 15:00:22 +01:00
7f22cb6d2b
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>
2020-01-20 21:06:40 +09:00
af70e54d71
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>
2020-01-20 21:05:52 +09:00
d39e289a76
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>
2020-01-20 21:05:36 +09:00
Thibaut Girka