fa4a92e340
Merge branch 'master' into glitch-soc/master
...
Conflicts:
- `config/locales/en.yml`
No real conflict, upstream added a translatable string “too close” to
one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
No real conflict, additional dependency in glitch-soc
2019-12-19 13:52:54 +01:00
99eff32701
Bump react-redux from 7.1.1 to 7.1.3 ( #12626 )
...
Bumps [react-redux](https://github.com/reduxjs/react-redux ) from 7.1.1 to 7.1.3.
- [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.1...v7.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:54:42 +09:00
2eb2a27323
Bump eslint-plugin-import from 2.19.0 to 2.19.1 ( #12622 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.19.0 to 2.19.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.19.0...v2.19.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:42:25 +09:00
449b4dbc27
Bump copy-webpack-plugin from 5.0.5 to 5.1.1 ( #12621 )
...
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin ) from 5.0.5 to 5.1.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.0.5...v5.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:42:02 +09:00
45155ede8c
Bump css-loader from 3.2.0 to 3.3.2 ( #12624 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.2.0 to 3.3.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.2.0...v3.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:41:49 +09:00
659d5f4b0c
Bump array-includes from 3.0.3 to 3.1.0 ( #12627 )
...
Bumps [array-includes](https://github.com/es-shims/array-includes ) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/es-shims/array-includes/releases )
- [Changelog](https://github.com/es-shims/array-includes/blob/master/CHANGELOG.md )
- [Commits](https://github.com/es-shims/array-includes/compare/v3.0.3...v3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 03:40:34 +09:00
10ebc46db6
Bump @babel/preset-env from 7.7.4 to 7.7.6 ( #12623 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.7.4 to 7.7.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.7.4...v7.7.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-17 10:20:49 +09:00
0bca0ddfde
Bump compression-webpack-plugin from 3.0.0 to 3.0.1 ( #12620 )
...
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/v3.0.1/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v3.0.0...v3.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-17 10:19:58 +09:00
e859334b33
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
Minor conflict due to glitch-soc's theming system
2019-12-12 15:40:06 +01:00
5fef3299cc
Bump yargs from 13.3.0 to 15.0.2 ( #12574 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 13.3.0 to 15.0.2.
- [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/v13.3.0...v15.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:37:37 +09:00
f1bea30fa6
Bump es6-symbol from 3.1.2 to 3.1.3 ( #12577 )
...
Bumps [es6-symbol](https://github.com/medikoo/es6-symbol ) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/medikoo/es6-symbol/releases )
- [Changelog](https://github.com/medikoo/es6-symbol/blob/master/CHANGELOG.md )
- [Commits](https://github.com/medikoo/es6-symbol/compare/v3.1.2...v3.1.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:37:08 +09:00
ece7462ea8
Bump eslint-plugin-import from 2.18.2 to 2.19.0 ( #12580 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.18.2 to 2.19.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.18.2...v2.19.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:36:28 +09:00
1109972875
Bump @babel/core from 7.7.4 to 7.7.5 ( #12578 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.7.4 to 7.7.5.
- [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.7.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:32:52 +09:00
5c78a30ab7
Bump @babel/runtime from 7.7.4 to 7.7.6 ( #12579 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.7.4 to 7.7.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/commits/v7.7.6/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:32:26 +09:00
234cdc0f05
Bump @babel/plugin-transform-runtime from 7.7.4 to 7.7.6 ( #12575 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel ) from 7.7.4 to 7.7.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.7.4...v7.7.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:31:53 +09:00
b86cc1d6d9
Bump react from 16.10.2 to 16.12.0 ( #12573 )
...
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react ) from 16.10.2 to 16.12.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.12.0/packages/react )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 20:31:03 +09:00
fe0229ceb7
Bump terser-webpack-plugin from 2.2.1 to 2.2.2 ( #12576 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 2.2.1 to 2.2.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.2.1...v2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 01:03:00 +01:00
2cc60e8b09
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- package.json
Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-07 12:28:59 +01:00
80a3e8e0e4
upgrade/replace websocket.js to @gamestdio/websocket v2 ( #12543 )
...
* Update stream.js
* Update package.json
* Update yarn.lock
Co-authored-by: hina <hina@hinaloe.net>
2019-12-04 20:45:49 +09:00
8809655e09
Bump autoprefixer from 9.6.1 to 9.7.3 ( #12519 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.6.1 to 9.7.3.
- [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.6.1...9.7.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-03 02:37:22 +09:00
34a810c9a7
Bump eslint-plugin-react from 7.16.0 to 7.17.0 ( #12524 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.16.0 to 7.17.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.16.0...v7.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-03 00:55:32 +09:00
9a0f2035ae
Bump blurhash from 1.0.0 to 1.1.3 ( #12411 )
...
Bumps [blurhash](https://github.com/woltapp/blurhash ) from 1.0.0 to 1.1.3.
- [Release notes](https://github.com/woltapp/blurhash/releases )
- [Commits](https://github.com/woltapp/blurhash/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 23:18:59 +09:00
e0c3c30bc2
Bump arrow-key-navigation from 1.0.2 to 1.1.0 ( #12523 )
...
Bumps [arrow-key-navigation](https://github.com/nolanlawson/arrow-key-navigation ) from 1.0.2 to 1.1.0.
- [Release notes](https://github.com/nolanlawson/arrow-key-navigation/releases )
- [Commits](https://github.com/nolanlawson/arrow-key-navigation/compare/v1.0.2...v1.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 22:59:12 +09:00
dd01d9f970
Bump rails-ujs from 5.2.3 to 5.2.4 ( #12526 )
...
Bumps [rails-ujs](https://github.com/rails/rails ) from 5.2.3 to 5.2.4.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 22:55:08 +09:00
a8f21f632d
Bump eslint from 6.5.1 to 6.7.2 ( #12522 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 6.5.1 to 6.7.2.
- [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.5.1...v6.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 22:53:03 +09:00
da8f9d665f
Remove unnecessary dependencies ( #12533 )
2019-12-02 13:38:53 +01:00
e48f63787d
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-30 17:29:44 +01:00
61073846e5
Bump @babel/plugin-transform-react-inline-elements from 7.2.0 to 7.7.4 ( #12467 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel ) from 7.2.0 to 7.7.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.2.0...v7.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 13:13:55 +09:00
e27aa4b00e
Bump @babel/preset-env from 7.7.1 to 7.7.4 ( #12471 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.7.1 to 7.7.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.7.1...v7.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 12:24:13 +09:00
275c06cfe7
Bump @babel/plugin-transform-react-jsx-self from 7.2.0 to 7.7.4 ( #12466 )
...
Bumps [@babel/plugin-transform-react-jsx-self](https://github.com/babel/babel ) from 7.2.0 to 7.7.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.2.0...v7.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 11:36:47 +09:00
a52d7fda37
Bump @babel/plugin-syntax-dynamic-import from 7.2.0 to 7.7.4 ( #12469 )
...
Bumps [@babel/plugin-syntax-dynamic-import](https://github.com/babel/babel ) from 7.2.0 to 7.7.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.2.0...v7.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 11:36:29 +09:00
15d5057c88
Bump @babel/runtime from 7.7.2 to 7.7.4 ( #12472 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.7.2 to 7.7.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.7.4/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 11:36:09 +09:00
779e6dd4a2
Bump @babel/plugin-transform-runtime from 7.5.5 to 7.7.4 ( #12473 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel ) from 7.5.5 to 7.7.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.5.5...v7.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 11:35:39 +09:00
eb8dd9e094
Revert "Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 ( #12311 )" ( #12454 )
...
This reverts commit dd1e0c1c31
2019-11-24 12:16:41 +09:00
a96375d2ef
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
2019-11-20 15:36:09 +01:00
772f4d649e
Bump react-dom from 16.11.0 to 16.12.0 ( #12415 )
...
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom ) from 16.11.0 to 16.12.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.12.0/packages/react-dom )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-20 05:28:00 +09:00
6fe02e3e19
Bump glob from 7.1.5 to 7.1.6 ( #12413 )
...
Bumps [glob](https://github.com/isaacs/node-glob ) from 7.1.5 to 7.1.6.
- [Release notes](https://github.com/isaacs/node-glob/releases )
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md )
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.5...v7.1.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 23:04:53 +09:00
5bb369e8a9
Bump babel-plugin-preval from 3.0.1 to 4.0.0 ( #12414 )
...
Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval ) from 3.0.1 to 4.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/v3.0.1...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:43:49 +09:00
8c5439d180
Bump react-textarea-autosize from 7.1.0 to 7.1.2 ( #12412 )
...
Bumps [react-textarea-autosize](https://github.com/andreypopp/react-textarea-autosize ) from 7.1.0 to 7.1.2.
- [Release notes](https://github.com/andreypopp/react-textarea-autosize/releases )
- [Commits](https://github.com/andreypopp/react-textarea-autosize/compare/v7.1.0...v7.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:30:10 +09:00
32ca84b8ec
Bump @babel/preset-react from 7.6.3 to 7.7.0 ( #12410 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel ) from 7.6.3 to 7.7.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.6.3...v7.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:21:52 +09:00
0639b1ae6c
Bump copy-webpack-plugin from 5.0.4 to 5.0.5 ( #12408 )
...
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin ) from 5.0.4 to 5.0.5.
- [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.0.4...v5.0.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:10:46 +09:00
0fc13a0320
Bump react-select from 3.0.5 to 3.0.8 ( #12407 )
...
Bumps [react-select](https://github.com/JedWatson/react-select ) from 3.0.5 to 3.0.8.
- [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.5...react-select@3.0.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-18 22:07:31 +09:00
018dcfc1ed
Bump @babel/core from 7.4.5 to 7.7.2 ( #12350 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.4.5 to 7.7.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/compare/v7.4.5...v7.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-12 00:25:34 +09:00
df312d6ad1
Bump @babel/plugin-proposal-decorators from 7.6.0 to 7.7.0 ( #12348 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel ) from 7.6.0 to 7.7.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.6.0...v7.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:52:24 +09:00
c20624f2d4
Bump @babel/runtime from 7.7.1 to 7.7.2 ( #12351 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.7.1 to 7.7.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.7.2/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:51:32 +09:00
a76f8a6ec7
Bump enzyme-adapter-react-16 from 1.14.0 to 1.15.1 ( #12353 )
...
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16 ) from 1.14.0 to 1.15.1.
- [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.1/packages/enzyme-adapter-react-16 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:50:55 +09:00
2ac4e34f14
Bump babel-plugin-react-intl from 3.1.3 to 3.4.1 ( #12352 )
...
Bumps [babel-plugin-react-intl](https://github.com/formatjs/formatjs ) from 3.1.3 to 3.4.1.
- [Release notes](https://github.com/formatjs/formatjs/releases )
- [Commits](https://github.com/formatjs/formatjs/compare/babel-plugin-react-intl@3.1.3...babel-plugin-react-intl@3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:45:58 +09:00
5fec97ef56
Bump react-notification from 6.8.4 to 6.8.5 ( #12349 )
...
Bumps [react-notification](https://github.com/pburtchaell/react-notification ) from 6.8.4 to 6.8.5.
- [Release notes](https://github.com/pburtchaell/react-notification/releases )
- [Commits](https://github.com/pburtchaell/react-notification/compare/6.8.4...6.8.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:24:27 +09:00
6b2d62ac73
Bump uuid from 3.3.2 to 3.3.3 ( #12347 )
...
Bumps [uuid](https://github.com/kelektiv/node-uuid ) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/kelektiv/node-uuid/releases )
- [Changelog](https://github.com/kelektiv/node-uuid/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kelektiv/node-uuid/compare/v3.3.2...v3.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:22:06 +09:00
f3435eceeb
Bump @babel/plugin-proposal-class-properties from 7.5.5 to 7.7.0 ( #12346 )
...
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel ) from 7.5.5 to 7.7.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.5.5...v7.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:17:22 +09:00
0dcf22119e
Bump @clusterws/cws from 0.15.2 to 0.16.0 ( #12345 )
...
Bumps @clusterws/cws from 0.15.2 to 0.16.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:15:31 +09:00
0fc784f8d0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
conflict because of the poll option limit being different than upstream's
2019-11-07 13:43:56 +01:00
e79ce4b7b8
Bump sass-loader from 7.1.0 to 8.0.0 ( #12027 )
...
* Bump sass-loader from 7.1.0 to 8.0.0
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader ) from 7.1.0 to 8.0.0.
- [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/v7.1.0...v8.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* bump webpack
2019-11-07 01:15:20 +09:00
a36a752322
Bump @babel/runtime from 7.6.0 to 7.7.1 ( #12317 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.6.0 to 7.7.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.7.1/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:55:46 +09:00
b3ed827697
Bump @babel/preset-env from 7.6.0 to 7.7.1 ( #12318 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.6.0 to 7.7.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/compare/v7.6.0...v7.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:55:22 +09:00
dd1e0c1c31
Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 ( #12311 )
...
Bumps [tesseract.js](https://github.com/naptha/tesseract.js ) from 2.0.0-alpha.16 to 2.0.0-beta.2.
- [Release notes](https://github.com/naptha/tesseract.js/releases )
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.16...v2.0.0-beta.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:14:46 +09:00
c4510801b3
Bump glob from 7.1.4 to 7.1.5 ( #12312 )
...
Bumps [glob](https://github.com/isaacs/node-glob ) from 7.1.4 to 7.1.5.
- [Release notes](https://github.com/isaacs/node-glob/releases )
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md )
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.4...v7.1.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:14:26 +09:00
6463ad5d3c
Bump sass from 1.23.1 to 1.23.3 ( #12314 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.23.1 to 1.23.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.23.1...1.23.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:12:48 +09:00
82f2b5dd92
Bump @babel/preset-react from 7.0.0 to 7.6.3 ( #12315 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel ) from 7.0.0 to 7.6.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.0.0...v7.6.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:11:08 +09:00
e7655951d7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`
2019-11-06 14:38:28 +01:00
4cbbf16a57
Bump webpack-cli from 3.3.9 to 3.3.10 ( #12297 )
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.3.9 to 3.3.10.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.10/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.9...v3.3.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-05 00:28:47 +09:00
29246e4fe0
Bump react-overlays from 0.8.3 to 0.9.1 ( #12298 )
...
Bumps [react-overlays](https://github.com/react-bootstrap/react-overlays ) from 0.8.3 to 0.9.1.
- [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.8.3...v0.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-05 00:23:26 +09:00
23e6a36d7c
Bump @babel/plugin-proposal-object-rest-spread from 7.5.5 to 7.6.2 ( #12296 )
...
Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel ) from 7.5.5 to 7.6.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/compare/v7.5.5...v7.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 23:33:05 +09:00
2a875748e2
Bump webpack-dev-server from 3.8.1 to 3.9.0 ( #12293 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.8.1 to 3.9.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.8.1...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 23:27:50 +09:00
0093aa37b0
Bump react-test-renderer from 16.10.2 to 16.11.0 ( #12295 )
...
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer ) from 16.10.2 to 16.11.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.11.0/packages/react-test-renderer )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 23:27:07 +09:00
9788f8bca5
Bump wavesurfer.js from 3.0.0 to 3.2.0 ( #12292 )
...
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js ) from 3.0.0 to 3.2.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.0.0...3.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 23:21:40 +09:00
0c982e73d3
Bump react-toggle from 4.0.2 to 4.1.1 ( #12291 )
...
Bumps [react-toggle](https://github.com/aaronshaf/react-toggle ) from 4.0.2 to 4.1.1.
- [Release notes](https://github.com/aaronshaf/react-toggle/releases )
- [Changelog](https://github.com/aaronshaf/react-toggle/blob/master/CHANGELOG.md )
- [Commits](https://github.com/aaronshaf/react-toggle/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 23:15:23 +09:00
a5c92c63d2
Bump react-dom from 16.10.2 to 16.11.0 ( #12289 )
...
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom ) from 16.10.2 to 16.11.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.11.0/packages/react-dom )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 22:55:46 +09:00
84e3b5a358
Use inert polyfill ( #12209 )
...
* Inserting wicg-inert in project
* Import wicg-inert in moda_root component
* Update yarn.lock
* Solving code style problems
* Removing package-lock
2019-11-04 13:03:44 +01:00
425da2dbaa
fix: support KaiOS arrow navigation on public pages ( #12251 )
2019-11-04 13:03:09 +01:00
864ca8719b
Bump dotenv from 8.0.0 to 8.2.0 ( #12235 )
...
Bumps [dotenv](https://github.com/motdotla/dotenv ) from 8.0.0 to 8.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases )
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md )
- [Commits](https://github.com/motdotla/dotenv/compare/v8.0.0...v8.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 11:12:05 +09:00
f5729ec2d7
Bump terser-webpack-plugin from 1.4.1 to 2.2.1 ( #12233 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 1.4.1 to 2.2.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/v1.4.1...v2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 10:59:12 +09:00
81acdc4151
Bump webpack-bundle-analyzer from 3.5.2 to 3.6.0 ( #12237 )
...
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer ) from 3.5.2 to 3.6.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.5.2...v3.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:46:31 +09:00
49aafcc5ef
Bump eslint-plugin-react from 7.14.3 to 7.16.0 ( #12234 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.14.3 to 7.16.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.14.3...v7.16.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:42:47 +09:00
9bf2c1cfe2
Bump sass from 1.23.0 to 1.23.1 ( #12238 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.23.0 to 1.23.1.
- [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.23.0...1.23.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:37:40 +09:00
387d162b7f
Bump @babel/plugin-proposal-decorators from 7.4.4 to 7.6.0 ( #12232 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel ) from 7.4.4 to 7.6.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.4.4...v7.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-28 20:04:24 +09:00
e76f4056e5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
Upstream moved account helpers to their own file, we had extra
helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
3dbd4384d8
Bump react-dom from 16.8.6 to 16.10.2 ( #12107 )
...
* Bump react-dom from 16.8.6 to 16.10.2
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom ) from 16.8.6 to 16.10.2.
- [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.10.2/packages/react-dom )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* update react and react-test-renderer
2019-10-22 01:51:05 +09:00
9483a56c04
Bump react-select from 2.4.4 to 3.0.5 ( #11930 )
...
* Bump react-select from 2.4.4 to 3.0.5
Bumps [react-select](https://github.com/JedWatson/react-select ) from 2.4.4 to 3.0.5.
- [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/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Change import path for react-select
2019-10-22 01:31:27 +09:00
491eb6e37b
Bump sass from 1.22.12 to 1.23.0 ( #12108 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.22.12 to 1.23.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.22.12...1.23.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-22 01:30:43 +09:00
a4ecd5dd6a
Bump @clusterws/cws from 0.15.0 to 0.15.2 ( #12109 )
...
Bumps @clusterws/cws from 0.15.0 to 0.15.2.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 19:32:43 +09:00
fbac5542ec
Bump eslint from 6.5.0 to 6.5.1 ( #12110 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 6.5.0 to 6.5.1.
- [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.5.0...v6.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 19:16:24 +09:00
8f49d709d5
Bump cross-env from 5.2.0 to 6.0.3 ( #12112 )
...
Bumps [cross-env](https://github.com/kentcdodds/cross-env ) from 5.2.0 to 6.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/v5.2.0...v6.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-21 19:16:01 +09:00
9506d9cafc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
4873962e4a
Bump tesseract.js from 2.0.0-alpha.15 to 2.0.0-alpha.16 ( #12013 )
...
Bumps [tesseract.js](https://github.com/naptha/tesseract.js ) from 2.0.0-alpha.15 to 2.0.0-alpha.16.
- [Release notes](https://github.com/naptha/tesseract.js/releases )
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.15...v2.0.0-alpha.16 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-04 10:23:32 +09:00
dae599ef6b
Bump eslint from 6.4.0 to 6.5.0 ( #12017 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 6.4.0 to 6.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.4.0...v6.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-04 10:21:22 +09:00
cc94c90bf1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
af62677c9f
Bump eslint from 6.1.0 to 6.4.0 ( #11929 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 6.1.0 to 6.4.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.1.0...v6.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 19:53:30 +09:00
65d666e9ae
Bump sass from 1.22.9 to 1.22.12 ( #11928 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.22.9 to 1.22.12.
- [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.22.9...1.22.12 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 19:22:51 +09:00
27b2338f65
Bump mini-css-extract-plugin from 0.7.0 to 0.8.0 ( #11927 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 0.7.0 to 0.8.0.
- [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/v0.7.0...v0.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 19:19:52 +09:00
28fe02aba3
Bump babel-jest from 24.8.0 to 24.9.0 ( #11926 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 24.8.0 to 24.9.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/v24.9.0/packages/babel-jest )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 19:19:13 +09:00
f7b3a49e1a
Rename package name to @tootsuite/mastodon ( #11892 )
2019-09-19 19:58:14 +02:00
4837d6275a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
7bfef64877
Fix eslint error of import/no-extraneous-dependencies ( #11884 )
...
* Fix eslint error of import/no-extraneous-dependencies
- Add history dependency
* refactoring code
2019-09-18 15:41:50 +02:00
dc35bb1ed2
Bump es6-symbol from 3.1.1 to 3.1.2 ( #11851 )
...
Bumps [es6-symbol](https://github.com/medikoo/es6-symbol ) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/medikoo/es6-symbol/releases )
- [Changelog](https://github.com/medikoo/es6-symbol/blob/master/CHANGELOG.md )
- [Commits](https://github.com/medikoo/es6-symbol/compare/v3.1.1...v3.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16 19:16:02 +09:00
09785659bf
Bump eslint-plugin-import from 2.18.0 to 2.18.2 ( #11849 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.18.0 to 2.18.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.18.0...v2.18.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16 19:15:21 +09:00
2e38d889a3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
Conflict because we changed the number of default results to be
configurable
- app/lib/settings/scoped_settings.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
091c47c8c3
Bump jest from 24.8.0 to 24.9.0 ( #11781 )
...
Bumps [jest](https://github.com/facebook/jest ) from 24.8.0 to 24.9.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.8.0...v24.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 20:07:02 +09:00
ff95d8fdf5
Bump @babel/preset-env from 7.5.5 to 7.6.0 ( #11780 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.5.5 to 7.6.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.5.5...v7.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 19:42:39 +09:00
e55dc2bb81
Bump tesseract.js from 2.0.0-alpha.13 to 2.0.0-alpha.15 ( #11779 )
...
Bumps [tesseract.js](https://github.com/naptha/tesseract.js ) from 2.0.0-alpha.13 to 2.0.0-alpha.15.
- [Release notes](https://github.com/naptha/tesseract.js/releases )
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.13...v2.0.0-alpha.15 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 19:40:30 +09:00
Thibaut Girka