Thibaut Girka
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
Thibaut Girka
e7655951d7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`
2019-11-06 14:38:28 +01:00
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
Gabriel Rubens
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
Nolan Lawson
425da2dbaa
fix: support KaiOS arrow navigation on public pages ( #12251 )
2019-11-04 13:03:09 +01:00
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
Thibaut Girka
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
Thibaut Girka
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
Thibaut Girka
c2d6ef1b64
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream raised max image size from 8MB to 10MB while our limit is
configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
Eugen Rochko
ae4b90354d
Bump webpack from 4.35.3 to 4.41.0 ( #12026 )
...
Fix #12023
2019-10-01 01:19:36 +02:00
Thibaut Girka
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
Eugen Rochko
009f0e0202
Bump set-value from 2.0.0 to 2.0.1 ( #11997 )
2019-09-29 16:54:35 +02:00
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
Thibaut Girka
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
nzws✨
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
Thibaut Girka
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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