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.
5 years ago
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>
5 years ago
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>
5 years ago
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.
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
6bd2186733
Bump autoprefixer from 9.7.3 to 9.7.4 ( #12890 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.7.3 to 9.7.4.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.3...9.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7cb2de8a39
Bump wavesurfer.js from 3.3.0 to 3.3.1 ( #12889 )
...
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js ) from 3.3.0 to 3.3.1.
- [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.3.0...3.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
acefc19975
Bump eslint-plugin-import from 2.19.1 to 2.20.0 ( #12888 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.19.1 to 2.20.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.19.1...v2.20.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7bf808d126
Bump compression-webpack-plugin from 3.0.1 to 3.1.0 ( #12896 )
...
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin ) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v3.0.1...v3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
2c15f9aaa2
Bump @babel/preset-react from 7.7.4 to 7.8.3 ( #12865 )
...
Bumps [@babel/preset-react](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>
5 years ago
37b5139822
Bump @babel/preset-env from 7.7.7 to 7.8.3 ( #12866 )
...
Bumps [@babel/preset-env](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>
5 years ago
1fd74ba09e
Bump @babel/plugin-transform-react-inline-elements from 7.7.4 to 7.8.0 ( #12848 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel ) from 7.7.4 to 7.8.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.7.4...v7.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
f82e028bfd
Bump axios from 0.19.0 to 0.19.1 ( #12846 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.19.0 to 0.19.1.
- [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/v0.19.0...0.19.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
392e84abe6
Bump @babel/runtime from 7.7.7 to 7.8.0 ( #12847 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.7.7 to 7.8.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/commits/v7.8.0/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e6c2254701
Bump css-loader from 3.4.1 to 3.4.2 ( #12842 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.4.1 to 3.4.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.4.1...v3.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
940b58eb9e
Bump @babel/plugin-proposal-decorators from 7.7.4 to 7.8.0 ( #12844 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel ) from 7.7.4 to 7.8.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.7.4...v7.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
923ae7067b
Bump terser-webpack-plugin from 2.3.1 to 2.3.2 ( #12839 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 2.3.1 to 2.3.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.3.1...v2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
512f5f9b2b
Bump sass-loader from 8.0.0 to 8.0.2 ( #12860 )
...
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader ) from 8.0.0 to 8.0.2.
- [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/v8.0.0...v8.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
980c004f06
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
No real conflict, glitch-soc-only dependency (redcarpet) too close to an
upstream one (rdf-normalize)
- `README.md`:
we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
Upstream added code to keep bookmarked statuses, we were already doing so
with slightly different code. Discarded upstream's changes.
- `package.json`:
No real conflict, glitch-soc-only dependency (favico.js) too close to
an upstream one
5 years ago
6ecc16de91
Bump file-loader from 4.2.0 to 5.0.2 ( #12521 )
...
Bumps [file-loader](https://github.com/webpack-contrib/file-loader ) from 4.2.0 to 5.0.2.
- [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/v4.2.0...v5.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
578553ba05
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
74c99e8b18
Bump sass from 1.24.0 to 1.24.2 ( #12778 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.24.0 to 1.24.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.24.0...1.24.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7dcecdfcbd
Bump wavesurfer.js from 3.2.0 to 3.3.0 ( #12775 )
...
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js ) from 3.2.0 to 3.3.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.2.0...3.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
061233d35d
Bump @clusterws/cws from 0.16.1 to 0.17.3 ( #12776 )
...
Bumps @clusterws/cws from 0.16.1 to 0.17.3.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
531afaef0f
Bump webpack-dev-server from 3.9.0 to 3.10.1 ( #12773 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.9.0 to 3.10.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v3.10.1/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.9.0...v3.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
7a7ef7fb0a
Bump enzyme-adapter-react-16 from 1.15.1 to 1.15.2 ( #12777 )
...
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16 ) from 1.15.1 to 1.15.2.
- [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.2/packages/enzyme-adapter-react-16 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
862ba3afad
Bump yargs from 15.0.2 to 15.1.0 ( #12771 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 15.0.2 to 15.1.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/v15.0.2...v15.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
e6fc490011
Bump css-loader from 3.4.0 to 3.4.1 ( #12772 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.0...v3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
01eaeab56d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
Conflict due to theming system.
5 years ago
500276c99b
fix unresolved external in @clusterws/cws by upgrading it ( #12752 )
5 years ago
108e390d23
Bump webpack from 4.41.2 to 4.41.5 ( #12724 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.41.2 to 4.41.5.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.41.2...v4.41.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
a2fe2e98ee
Bump react-test-renderer from 16.11.0 to 16.12.0 ( #12721 )
...
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer ) 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-test-renderer )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
6245075158
Bump is-nan from 1.2.1 to 1.3.0 ( #12723 )
...
Bumps [is-nan](https://github.com/es-shims/is-nan ) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/es-shims/is-nan/releases )
- [Changelog](https://github.com/es-shims/is-nan/blob/master/CHANGELOG.md )
- [Commits](https://github.com/es-shims/is-nan/compare/v1.2.1...v1.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
3902b7677a
Bump terser-webpack-plugin from 2.2.2 to 2.3.1 ( #12722 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 2.2.2 to 2.3.1.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v2.2.2...v2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ed34c0401a
Bump @babel/core from 7.7.5 to 7.7.7 ( #12720 )
...
Bumps [@babel/core](https://github.com/babel/babel ) from 7.7.5 to 7.7.7.
- [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.5...v7.7.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
0242f8ae8b
Bump redux from 4.0.4 to 4.0.5 ( #12719 )
...
Bumps [redux](https://github.com/reduxjs/redux ) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/reduxjs/redux/releases )
- [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/redux/compare/v4.0.4...v4.0.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
54e6c1c47e
Bump eslint from 6.7.2 to 6.8.0 ( #12717 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 6.7.2 to 6.8.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.7.2...v6.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ad29279214
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`
- `package.json`
5 years ago
7ff7ca8c7c
[Security] Bump handlebars from 4.2.0 to 4.5.3 ( #12694 )
...
Bumps [handlebars](https://github.com/wycats/handlebars.js ) from 4.2.0 to 4.5.3. **This update includes a security fix.**
- [Release notes](https://github.com/wycats/handlebars.js/releases )
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md )
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.0...v4.5.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
8e2cbade79
Bump @babel/runtime from 7.7.6 to 7.7.7 ( #12670 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.7.6 to 7.7.7.
- [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.7/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
14cca940d9
Bump enzyme from 3.10.0 to 3.11.0 ( #12675 )
...
Bumps [enzyme](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme ) from 3.10.0 to 3.11.0.
- [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@3.11.0/packages/enzyme )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
038a1246f5
Bump object.values from 1.1.0 to 1.1.1 ( #12625 )
...
Bumps [object.values](https://github.com/es-shims/Object.values ) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/es-shims/Object.values/releases )
- [Changelog](https://github.com/es-shims/Object.values/blob/master/CHANGELOG.md )
- [Commits](https://github.com/es-shims/Object.values/compare/v1.1.0...v1.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
504763dd06
Bump @babel/preset-env from 7.7.6 to 7.7.7 ( #12672 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel ) from 7.7.6 to 7.7.7.
- [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.7.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
530ac83cc1
Bump css-loader from 3.3.2 to 3.4.0 ( #12673 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.3.2 to 3.4.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.3.2...v3.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ec6de73001
Bump mini-css-extract-plugin from 0.8.0 to 0.9.0 ( #12674 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 0.8.0 to 0.9.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.8.0...v0.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
d29655c495
Bump sass from 1.23.3 to 1.24.0 ( #12676 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.23.3 to 1.24.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.23.3...1.24.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
41854528ee
Bump array-includes from 3.1.0 to 3.1.1 ( #12671 )
...
Bumps [array-includes](https://github.com/es-shims/array-includes ) from 3.1.0 to 3.1.1.
- [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.1.0...v3.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
ab5ff638f2
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
5 years ago
Thibaut Girka
dependabot-preview[bot]
Bastien Durel